Changeset 740 for vendor/current/source3/lib/bitmap.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/source3/lib/bitmap.c (modified) (3 diffs)

vendor/current/source3/lib/bitmap.c

@@ -24 +24 @@
 
 /****************************************************************************
-allocate a bitmap of the specified size
-****************************************************************************/
-struct bitmap *bitmap_allocate(int n)
-{
-        struct bitmap *bm;
-
-        bm = SMB_MALLOC_P(struct bitmap);
-
-        if (!bm) return NULL;
-
-        bm->n = n;
-        bm->b = SMB_MALLOC_ARRAY(uint32, (n+31)/32);
-        if (!bm->b) {
-                SAFE_FREE(bm);
-                return NULL;
-        }
-
-        memset(bm->b, 0, sizeof(uint32)*((n+31)/32));
-
-        return bm;
-}
-
-/****************************************************************************
-free a bitmap.
-****************************************************************************/
-
-void bitmap_free(struct bitmap *bm)
-{
-        if (!bm)
-                return;
-
-        SAFE_FREE(bm->b);
-        SAFE_FREE(bm);
-}
-
-/****************************************************************************
 talloc a bitmap
 ****************************************************************************/
@@ -66 +30 @@
         struct bitmap *bm;
 
-        if (!mem_ctx) return NULL;
-
         bm = TALLOC_P(mem_ctx, struct bitmap);
 
@@ -73 +35 @@
 
         bm->n = n;
-        bm->b = TALLOC_ARRAY(mem_ctx, uint32, (n+31)/32);
+        bm->b = TALLOC_ZERO_ARRAY(bm, uint32, (n+31)/32);
         if (!bm->b) {
+                TALLOC_FREE(bm);
                 return NULL;
         }
-
-        memset(bm->b, 0, sizeof(uint32)*((n+31)/32));
-
         return bm;
 }