Actually complete 3662c2b...

[jra/samba/.git] / source3 / lib / bitmap.c

diff --git a/source3/lib/bitmap.c b/source3/lib/bitmap.c
index 3fa20cdd112c8429f39b253f6e953ec821001f8c..5e623f474abcd8e36fd8335385243be3f267ae2c 100644 (file)
--- a/source3/lib/bitmap.c
+++ b/source3/lib/bitmap.c
@@ -5,7 +5,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
@@ -30,18 +29,18 @@ struct bitmap *bitmap_allocate(int n)
 {
        struct bitmap *bm;
 
-       bm = (struct bitmap *)malloc(sizeof(*bm));
+       bm = SMB_MALLOC_P(struct bitmap);
 
        if (!bm) return NULL;
        
        bm->n = n;
-       bm->b = (uint32 *)malloc(sizeof(bm->b[0])*(n+31)/32);
+       bm->b = SMB_MALLOC_ARRAY(uint32, (n+31)/32);
        if (!bm->b) {
                SAFE_FREE(bm);
                return NULL;
        }
 
-       memset(bm->b, 0, sizeof(bm->b[0])*(n+31)/32);
+       memset(bm->b, 0, sizeof(uint32)*((n+31)/32));
 
        return bm;
 }
@@ -68,17 +67,17 @@ struct bitmap *bitmap_talloc(TALLOC_CTX *mem_ctx, int n)
 
        if (!mem_ctx) return NULL;
 
-       bm = (struct bitmap *)talloc(mem_ctx, sizeof(*bm));
+       bm = TALLOC_P(mem_ctx, struct bitmap);
 
        if (!bm) return NULL;
        
        bm->n = n;
-       bm->b = (uint32 *)talloc(mem_ctx, sizeof(bm->b[0])*(n+31)/32);
+       bm->b = TALLOC_ARRAY(mem_ctx, uint32, (n+31)/32);
        if (!bm->b) {
                return NULL;
        }
 
-       memset(bm->b, 0, sizeof(bm->b[0])*(n+31)/32);
+       memset(bm->b, 0, sizeof(uint32)*((n+31)/32));
 
        return bm;
 }
@@ -92,7 +91,7 @@ int bitmap_copy(struct bitmap * const dst, const struct bitmap * const src)
         int count = MIN(dst->n, src->n);
 
         SMB_ASSERT(dst->b != src->b);
-       memcpy(dst->b, src->b, sizeof(dst->b[0])*(count+31)/32);
+       memcpy(dst->b, src->b, sizeof(uint32)*((count+31)/32));
 
         return count;
 }
@@ -100,7 +99,7 @@ int bitmap_copy(struct bitmap * const dst, const struct bitmap * const src)
 /****************************************************************************
 set a bit in a bitmap
 ****************************************************************************/
-BOOL bitmap_set(struct bitmap *bm, unsigned i)
+bool bitmap_set(struct bitmap *bm, unsigned i)
 {
        if (i >= bm->n) {
                DEBUG(0,("Setting invalid bitmap entry %d (of %d)\n",
@@ -114,7 +113,7 @@ BOOL bitmap_set(struct bitmap *bm, unsigned i)
 /****************************************************************************
 clear a bit in a bitmap
 ****************************************************************************/
-BOOL bitmap_clear(struct bitmap *bm, unsigned i)
+bool bitmap_clear(struct bitmap *bm, unsigned i)
 {
        if (i >= bm->n) {
                DEBUG(0,("clearing invalid bitmap entry %d (of %d)\n",
@@ -128,7 +127,7 @@ BOOL bitmap_clear(struct bitmap *bm, unsigned i)
 /****************************************************************************
 query a bit in a bitmap
 ****************************************************************************/
-BOOL bitmap_query(struct bitmap *bm, unsigned i)
+bool bitmap_query(struct bitmap *bm, unsigned i)
 {
        if (i >= bm->n) return False;
        if (bm->b[i/32] & (1<<(i%32))) {