Make the bitmap responsible for allocation.

diff --git a/src/lib/kernel/bitmap.c b/src/lib/kernel/bitmap.c
index 7bbc92868ca9fdf908798c919c168c7b3b44732b..3690a3a37c71500efeaa031fdaa2aeff2971c5dc 100644 (file)
--- a/src/lib/kernel/bitmap.c
+++ b/src/lib/kernel/bitmap.c
@@ -8,9 +8,28 @@
 #include "filesys/file.h"
 #endif
 \f
+/* Element type.
+
+   This must be an unsigned integer type at least as wide as int.
+
+   Each bit represents one bit in the bitmap.
+   If bit 0 in an element represents bit K in the bitmap,
+   then bit 1 in the element represents bit K+1 in the bitmap,
+   and so on. */
+typedef unsigned long elem_type;
+
 /* Number of bits in an element. */
 #define ELEM_BITS (sizeof (elem_type) * CHAR_BIT)
 
+/* From the outside, a bitmap is an array of bits.  From the
+   inside, it's an array of elem_type (defined above) that
+   simulates an array of bits. */
+struct bitmap
+  {
+    size_t bit_cnt;     /* Number of bits. */
+    elem_type *bits;    /* Elements that represent bits. */
+  };
+
 /* Returns the index of the element that contains the bit
    numbered BIT_IDX. */
 static inline size_t
@@ -53,25 +72,33 @@ last_mask (const struct bitmap *b)
 /* Initializes B to be a bitmap of BIT_CNT bits.
    Returns true if successfalse, false if memory allocation
    failed. */
-bool
-bitmap_init (struct bitmap *b, size_t bit_cnt) 
+struct bitmap *
+bitmap_create (size_t bit_cnt) 
 {
-  b->bit_cnt = bit_cnt;
-  b->bits = malloc (byte_cnt (b));
-  if (b->bits == NULL && bit_cnt > 0) 
-    return false;
-
-  bitmap_set_all (b, false);
-  return true;
+  struct bitmap *b = malloc (sizeof *b);
+  if (b != NULL)
+    {
+      b->bit_cnt = bit_cnt;
+      b->bits = malloc (byte_cnt (b));
+      if (b->bits != NULL || bit_cnt == 0)
+        {
+          bitmap_set_all (b, false);
+          return b;
+        }
+      free (b);
+    }
+  return NULL;
 }
 
 /* Destroys bitmap B, freeing its storage. */
 void
 bitmap_destroy (struct bitmap *b) 
 {
-  ASSERT (b);
-  
-  free (b->bits);
+  if (b != NULL) 
+    {
+      free (b->bits);
+      free (b);
+    }
 }
 
 /* Returns the number of bits in B. */

diff --git a/src/lib/kernel/bitmap.h b/src/lib/kernel/bitmap.h
index f70688b28662e70233cef635a2c1dcece495808b..8aef186f709a6073c6c445f19b20285f2b114d08 100644 (file)
--- a/src/lib/kernel/bitmap.h
+++ b/src/lib/kernel/bitmap.h
@@ -6,26 +6,7 @@
 
 /* Bitmap abstract data type. */
 
-/* Element type.
-
-   This must be an unsigned integer type at least as wide as int.
-
-   Each bit represents one bit in the bitmap.
-   If bit 0 in an element represents bit K in the bitmap,
-   then bit 1 in the element represents bit K+1 in the bitmap,
-   and so on. */
-typedef unsigned long elem_type;
-
-/* From the outside, a bitmap is an array of bits.  From the
-   inside, it's an array of elem_type (defined above) that
-   simulates an array of bits. */
-struct bitmap
-  {
-    size_t bit_cnt;     /* Number of bits. */
-    elem_type *bits;    /* Elements that represent bits. */
-  };
-
-bool bitmap_init (struct bitmap *, size_t bit_cnt);
+struct bitmap *bitmap_create (size_t bit_cnt);
 void bitmap_destroy (struct bitmap *);
 
 size_t bitmap_size (const struct bitmap *);