bitmap: use unsigned int for iterating over bitmap words

[ccan] / ccan / bitmap / bitmap.h

diff --git a/ccan/bitmap/bitmap.h b/ccan/bitmap/bitmap.h
index 259b35149a90b3286d1ead12ec2c00f0e5dc47dc..2be18f31e773e2d21482db199403a770cbd43bf3 100644 (file)
--- a/ccan/bitmap/bitmap.h
+++ b/ccan/bitmap/bitmap.h
@@ -22,6 +22,9 @@ typedef struct {
        bitmap_word w;
 } bitmap;
 
+#define BITMAP_DECLARE(_name, _nbits) \
+       bitmap (_name)[BITMAP_NWORDS(_nbits)]
+
 static inline size_t bitmap_sizeof(int nbits)
 {
        return BITMAP_NWORDS(nbits) * sizeof(bitmap_word);
@@ -35,9 +38,9 @@ static inline bitmap *bitmap_alloc(int nbits)
 static inline bitmap_word bitmap_bswap(bitmap_word w)
 {
        if (BITMAP_WORD_BITS == 32)
-               return cpu_to_be32(w);
+               return (ENDIAN_CAST bitmap_word)cpu_to_be32(w);
        else if (BITMAP_WORD_BITS == 64)
-               return cpu_to_be64(w);
+               return (ENDIAN_CAST bitmap_word)cpu_to_be64(w);
 }
 
 #define BITMAP_WORD(_bm, _n)   ((_bm)[(_n) / BITMAP_WORD_BITS].w)
@@ -97,7 +100,7 @@ static inline void bitmap_copy(bitmap *dst, bitmap *src, int nbits)
        static inline void bitmap_##_name(bitmap *dst, bitmap *src1, bitmap *src2, \
                                         int nbits) \
        { \
-               int i = 0; \
+               unsigned int i = 0; \
                for (i = 0; i < BITMAP_NWORDS(nbits); i++) { \
                        dst[i].w = src1[i].w _op src2[i].w; \
                } \
@@ -112,7 +115,7 @@ BITMAP_DEF_BINOP(andnot, & ~)
 
 static inline void bitmap_complement(bitmap *dst, bitmap *src, int nbits)
 {
-       int i;
+       unsigned int i;
 
        for (i = 0; i < BITMAP_NWORDS(nbits); i++)
                dst[i].w = ~src[i].w;
@@ -127,7 +130,7 @@ static inline bool bitmap_equal(bitmap *src1, bitmap *src2, int nbits)
 
 static inline bool bitmap_intersects(bitmap *src1, bitmap *src2, int nbits)
 {
-       int i;
+       unsigned int i;
 
        for (i = 0; i < BITMAP_HEADWORDS(nbits); i++) {
                if (src1[i].w & src2[i].w)
@@ -141,7 +144,7 @@ static inline bool bitmap_intersects(bitmap *src1, bitmap *src2, int nbits)
 
 static inline bool bitmap_subset(bitmap *src1, bitmap *src2, int nbits)
 {
-       int i;
+       unsigned int i;
 
        for (i = 0; i < BITMAP_HEADWORDS(nbits); i++) {
                if (src1[i].w  & ~src2[i].w)
@@ -155,7 +158,7 @@ static inline bool bitmap_subset(bitmap *src1, bitmap *src2, int nbits)
 
 static inline bool bitmap_full(bitmap *bitmap, int nbits)
 {
-       int i;
+       unsigned int i;
 
        for (i = 0; i < BITMAP_HEADWORDS(nbits); i++) {
                if (bitmap[i].w != -1UL)
@@ -170,7 +173,7 @@ static inline bool bitmap_full(bitmap *bitmap, int nbits)
 
 static inline bool bitmap_empty(bitmap *bitmap, int nbits)
 {
-       int i;
+       unsigned int i;
 
        for (i = 0; i < BITMAP_HEADWORDS(nbits); i++) {
                if (bitmap[i].w != 0)