Changeset 566da7f8 in mainline for kernel/generic/src/mm

Timestamp:

2014-04-24T06:47:53Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

e36a1c2

Parents:

88a0f58

Message:

Fix another bunch of maybe-uninitialized warnings

Location:

kernel/generic/src/mm

Files:

• as.c (modified) (2 diffs)
• frame.c (modified) (1 diff)

kernel/generic/src/mm/as.c

@@ -1725 +1725 @@
         ASSERT(count);
         
-        btree_node_t *leaf;
+        btree_node_t *leaf = NULL;
         size_t pages = (size_t) btree_search(&area->used_space, page, &leaf);
         if (pages) {
@@ -1733 +1733 @@
                 return false;
         }
+
+        ASSERT(leaf != NULL);
         
         if (!leaf->keys) {

kernel/generic/src/mm/frame.c

@@ -391 +391 @@
         
         /* Allocate frames from zone */
-        size_t index;
+        size_t index = (size_t) -1;
         int avail = bitmap_allocate_range(&zone->bitmap, count, zone->base,
             FRAME_LOWPRIO, constraint, &index);
         
         ASSERT(avail);
+        ASSERT(index != (size_t) -1);
         
         /* Update frame reference count */