s3-talloc Change TALLOC_P() to talloc()

[nivanova/samba-autobuild/.git] / source3 / lib / bitmap.c

diff --git a/source3/lib/bitmap.c b/source3/lib/bitmap.c
index 26d21d085f685111ed804cc6c3deb6852f4b8139..0acfcd8813a55e36201cef11122f697d08a58920 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"
@@ -24,69 +23,43 @@
    pool without repetition */
 
 /****************************************************************************
-allocate a bitmap of the specified size
+talloc a bitmap
 ****************************************************************************/
-struct bitmap *bitmap_allocate(int n)
+struct bitmap *bitmap_talloc(TALLOC_CTX *mem_ctx, int n)
 {
        struct bitmap *bm;
 
-       bm = (struct bitmap *)malloc(sizeof(*bm));
+       bm = talloc(mem_ctx, struct bitmap);
 
        if (!bm) return NULL;
-       
+
        bm->n = n;
-       bm->b = (uint32 *)malloc(sizeof(bm->b[0])*(n+31)/32);
+       bm->b = TALLOC_ZERO_ARRAY(bm, uint32, (n+31)/32);
        if (!bm->b) {
-               SAFE_FREE(bm);
+               TALLOC_FREE(bm);
                return NULL;
        }
-
-       memset(bm->b, 0, sizeof(bm->b[0])*(n+31)/32);
-
        return bm;
 }
 
 /****************************************************************************
-free a bitmap.
+copy as much of the source bitmap as will fit in the destination bitmap.
 ****************************************************************************/
 
-void bitmap_free(struct bitmap *bm)
+int bitmap_copy(struct bitmap * const dst, const struct bitmap * const src)
 {
-       if (!bm)
-               return;
+        int count = MIN(dst->n, src->n);
 
-       SAFE_FREE(bm->b);
-       SAFE_FREE(bm);
-}
+        SMB_ASSERT(dst->b != src->b);
+       memcpy(dst->b, src->b, sizeof(uint32)*((count+31)/32));
 
-/****************************************************************************
-talloc a bitmap
-****************************************************************************/
-struct bitmap *bitmap_talloc(TALLOC_CTX *mem_ctx, int n)
-{
-       struct bitmap *bm;
-
-       if (!mem_ctx) return NULL;
-
-       bm = (struct bitmap *)talloc(mem_ctx, sizeof(*bm));
-
-       if (!bm) return NULL;
-       
-       bm->n = n;
-       bm->b = (uint32 *)talloc(mem_ctx, sizeof(bm->b[0])*(n+31)/32);
-       if (!bm->b) {
-               return NULL;
-       }
-
-       memset(bm->b, 0, sizeof(bm->b[0])*(n+31)/32);
-
-       return bm;
+        return count;
 }
 
 /****************************************************************************
 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",
@@ -100,7 +73,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",
@@ -114,7 +87,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))) {
@@ -129,7 +102,7 @@ wraparound
 ****************************************************************************/
 int bitmap_find(struct bitmap *bm, unsigned ofs)
 {
-       int i, j;
+       unsigned int i, j;
 
        if (ofs > bm->n) ofs = 0;