Properly prepare the scalars before filling or copying into them

[perl/modules/Scalar-Vec-Util.git] / bitvect.h

diff --git a/bitvect.h b/bitvect.h
index a62f472af79666e31bd8aa4c3b1e228b6b37642d..0f096fdb7f61ec000de50f0cd8d6705485f5f116 100644 (file)
--- a/bitvect.h
+++ b/bitvect.h
@@ -12,10 +12,10 @@
 # define BV_UNIT unsigned char
 #endif
 
-#define BV_SIZE(I) ((((I) % CHAR_BIT) != 0) + ((I) / CHAR_BIT))
-
 #define BITS(T) (CHAR_BIT * sizeof(T))
 
+#define BV_SIZE(I) (((((I) % BITS(BV_UNIT)) != 0) + ((I) / BITS(BV_UNIT))) * sizeof(BV_UNIT))
+
 /* 0 <= I <  CHAR_BIT * sizeof(T) */
 #define BV_MASK_LOWER(T, I)  (~((~((T) 0)) << (I)))
 /* 0 <  I <= CHAR_BIT * sizeof(T) */
@@ -501,7 +501,7 @@ INLINE_DECLARE(void bv_fill(void *bv_, size_t s, size_t l, unsigned int f))
  T mask, *bv = (T *) bv_;
 
  if (f)
-  f = ~0;
+  f = ~0u;
 
  bv += s / BITS(T);
  o   = s % BITS(T);