Changeset 315b7e3 in mainline for kernel/generic/src/mm/as.c

Timestamp:

2015-06-04T14:12:19Z (9 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7ec3c56

Parents:

09024119

Message:

avoid the local variable 'size' hiding function argument 'size'
(reported by Coverity as CID 10364)

File:

• kernel/generic/src/mm/as.c (modified) (4 diffs)

kernel/generic/src/mm/as.c

@@ -834 +834 @@
                         if ((cond = (bool) node->keys)) {
                                 uintptr_t ptr = node->key[node->keys - 1];
-                                size_t size =
+                                size_t node_size =
                                     (size_t) node->value[node->keys - 1];
                                 size_t i = 0;
                                 
-                                if (overlaps(ptr, P2SZ(size), area->base,
+                                if (overlaps(ptr, P2SZ(node_size), area->base,
                                     P2SZ(pages))) {
                                         
-                                        if (ptr + P2SZ(size) <= start_free) {
+                                        if (ptr + P2SZ(node_size) <= start_free) {
                                                 /*
                                                  * The whole interval fits
@@ -860 +860 @@
                                         i = (start_free - ptr) >> PAGE_WIDTH;
                                         if (!used_space_remove(area, start_free,
-                                            size - i))
+                                            node_size - i))
                                                 panic("Cannot remove used space.");
                                 } else {
@@ -867 +867 @@
                                          * completely removed.
                                          */
-                                        if (!used_space_remove(area, ptr, size))
+                                        if (!used_space_remove(area, ptr, node_size))
                                                 panic("Cannot remove used space.");
                                 }
@@ -887 +887 @@
                                     area->pages - pages);
                 
-                                for (; i < size; i++) {
+                                for (; i < node_size; i++) {
                                         pte_t *pte = page_mapping_find(as,
                                             ptr + P2SZ(i), false);