X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fbitmap%2Fbitmap.h;h=794b2650361955f29dbf2a0fc2f5265afb3daaf8;hb=d91a3b8b416ed12bf7c0d5b0bda902b7ae769a40;hp=50086c065303d06f435c472eed11439cf8048e49;hpb=9273220c47005235da7cfed1221e13dd19065093;p=ccan

diff --git a/ccan/bitmap/bitmap.h b/ccan/bitmap/bitmap.h
index 50086c06..794b2650 100644
--- a/ccan/bitmap/bitmap.h
+++ b/ccan/bitmap/bitmap.h
@@ -25,12 +25,12 @@ typedef struct {
 #define BITMAP_DECLARE(_name, _nbits) \
 	bitmap (_name)[BITMAP_NWORDS(_nbits)]
 
-static inline size_t bitmap_sizeof(int nbits)
+static inline size_t bitmap_sizeof(unsigned long nbits)
 {
 	return BITMAP_NWORDS(nbits) * sizeof(bitmap_word);
 }
 
-static inline bitmap *bitmap_alloc(int nbits)
+static inline bitmap *bitmap_alloc(unsigned long nbits)
 {
 	return malloc(bitmap_sizeof(nbits));
 }
@@ -60,47 +60,48 @@ static inline bitmap_word bitmap_bswap(bitmap_word w)
 #define BITMAP_TAIL(_bm, _nbits) \
 	(BITMAP_TAILWORD(_bm, _nbits) & BITMAP_TAILBITS(_nbits))
 
-static inline void bitmap_set_bit(bitmap *bitmap, int n)
+static inline void bitmap_set_bit(bitmap *bitmap, unsigned long n)
 {
 	BITMAP_WORD(bitmap, n) |= BITMAP_WORDBIT(n);
 }
 
-static inline void bitmap_clear_bit(bitmap *bitmap, int n)
+static inline void bitmap_clear_bit(bitmap *bitmap, unsigned long n)
 {
 	BITMAP_WORD(bitmap, n) &= ~BITMAP_WORDBIT(n);
 }
 
-static inline void bitmap_change_bit(bitmap *bitmap, int n)
+static inline void bitmap_change_bit(bitmap *bitmap, unsigned long n)
 {
 	BITMAP_WORD(bitmap, n) ^= BITMAP_WORDBIT(n);
 }
 
-static inline bool bitmap_test_bit(bitmap *bitmap, int n)
+static inline bool bitmap_test_bit(const bitmap *bitmap, unsigned long n)
 {
 	return !!(BITMAP_WORD(bitmap, n) & BITMAP_WORDBIT(n));
 }
 
 
-static inline void bitmap_zero(bitmap *bitmap, int nbits)
+static inline void bitmap_zero(bitmap *bitmap, unsigned long nbits)
 {
 	memset(bitmap, 0, bitmap_sizeof(nbits));
 }
 
-static inline void bitmap_fill(bitmap *bitmap, int nbits)
+static inline void bitmap_fill(bitmap *bitmap, unsigned long nbits)
 {
 	memset(bitmap, 0xff, bitmap_sizeof(nbits));
 }
 
-static inline void bitmap_copy(bitmap *dst, bitmap *src, int nbits)
+static inline void bitmap_copy(bitmap *dst, const bitmap *src,
+			       unsigned long nbits)
 {
 	memcpy(dst, src, bitmap_sizeof(nbits));
 }
 
 #define BITMAP_DEF_BINOP(_name, _op) \
 	static inline void bitmap_##_name(bitmap *dst, bitmap *src1, bitmap *src2, \
-					 int nbits) \
+					  unsigned long nbits)		\
 	{ \
-		int i = 0; \
+		unsigned long i = 0; \
 		for (i = 0; i < BITMAP_NWORDS(nbits); i++) { \
 			dst[i].w = src1[i].w _op src2[i].w; \
 		} \
@@ -113,24 +114,27 @@ BITMAP_DEF_BINOP(andnot, & ~)
 
 #undef BITMAP_DEF_BINOP
 
-static inline void bitmap_complement(bitmap *dst, bitmap *src, int nbits)
+static inline void bitmap_complement(bitmap *dst, const bitmap *src,
+				     unsigned long nbits)
 {
-	int i;
+	unsigned long i;
 
 	for (i = 0; i < BITMAP_NWORDS(nbits); i++)
 		dst[i].w = ~src[i].w;
 }
 
-static inline bool bitmap_equal(bitmap *src1, bitmap *src2, int nbits)
+static inline bool bitmap_equal(const bitmap *src1, const bitmap *src2,
+				unsigned long nbits)
 {
 	return (memcmp(src1, src2, BITMAP_HEADBYTES(nbits)) == 0)
 		&& (!BITMAP_HASTAIL(nbits)
 		    || (BITMAP_TAIL(src1, nbits) == BITMAP_TAIL(src2, nbits)));
 }
 
-static inline bool bitmap_intersects(bitmap *src1, bitmap *src2, int nbits)
+static inline bool bitmap_intersects(const bitmap *src1, const bitmap *src2,
+				     unsigned long nbits)
 {
-	int i;
+	unsigned long i;
 
 	for (i = 0; i < BITMAP_HEADWORDS(nbits); i++) {
 		if (src1[i].w & src2[i].w)
@@ -142,9 +146,10 @@ static inline bool bitmap_intersects(bitmap *src1, bitmap *src2, int nbits)
 	return false;
 }
 
-static inline bool bitmap_subset(bitmap *src1, bitmap *src2, int nbits)
+static inline bool bitmap_subset(const bitmap *src1, const bitmap *src2,
+				 unsigned long nbits)
 {
-	int i;
+	unsigned long i;
 
 	for (i = 0; i < BITMAP_HEADWORDS(nbits); i++) {
 		if (src1[i].w  & ~src2[i].w)
@@ -156,9 +161,9 @@ static inline bool bitmap_subset(bitmap *src1, bitmap *src2, int nbits)
 	return true;
 }
 
-static inline bool bitmap_full(bitmap *bitmap, int nbits)
+static inline bool bitmap_full(const bitmap *bitmap, unsigned long nbits)
 {
-	int i;
+	unsigned long i;
 
 	for (i = 0; i < BITMAP_HEADWORDS(nbits); i++) {
 		if (bitmap[i].w != -1UL)
@@ -171,9 +176,9 @@ static inline bool bitmap_full(bitmap *bitmap, int nbits)
 	return true;
 }
 
-static inline bool bitmap_empty(bitmap *bitmap, int nbits)
+static inline bool bitmap_empty(const bitmap *bitmap, unsigned long nbits)
 {
-	int i;
+	unsigned long i;
 
 	for (i = 0; i < BITMAP_HEADWORDS(nbits); i++) {
 		if (bitmap[i].w != 0)