Changeset 919 for vendor/current/source3/lib

Timestamp:

Jun 9, 2016, 2:17:22 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: apply latest security patches to vendor

File:

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

vendor/current/source3/lib/bitmap.c

@@ -19 +19 @@
 
 #include "includes.h"
+#include "lib/util/bitmap.h"
 
 /* these functions provide a simple way to allocate integers from a
@@ -30 +31 @@
         struct bitmap *bm;
 
-        bm = TALLOC_P(mem_ctx, struct bitmap);
+        bm = talloc_zero(mem_ctx, struct bitmap);
 
         if (!bm) return NULL;
 
         bm->n = n;
-        bm->b = TALLOC_ZERO_ARRAY(bm, uint32, (n+31)/32);
+        bm->b = talloc_zero_array(bm, uint32_t, (n+31)/32);
         if (!bm->b) {
                 TALLOC_FREE(bm);
@@ -52 +53 @@
 
         SMB_ASSERT(dst->b != src->b);
-        memcpy(dst->b, src->b, sizeof(uint32)*((count+31)/32));
+        memcpy(dst->b, src->b, sizeof(uint32_t)*((count+31)/32));
 
         return count;
@@ -65 +66 @@
                 DEBUG(0,("Setting invalid bitmap entry %d (of %d)\n",
                       i, bm->n));
-                return False;
+                return false;
         }
         bm->b[i/32] |= (1<<(i%32));
-        return True;
+        return true;
 }
 
@@ -79 +80 @@
                 DEBUG(0,("clearing invalid bitmap entry %d (of %d)\n",
                       i, bm->n));
-                return False;
+                return false;
         }
         bm->b[i/32] &= ~(1<<(i%32));
-        return True;
+        return true;
 }
 
@@ -90 +91 @@
 bool bitmap_query(struct bitmap *bm, unsigned i)
 {
-        if (i >= bm->n) return False;
+        if (i >= bm->n) return false;
         if (bm->b[i/32] & (1<<(i%32))) {
-                return True;
+                return true;
         }
-        return False;
+        return false;
 }