X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=ucw%2Fbitarray.h;h=78ee9d91ef91a9cc35a6a6ffda386e9609c7ad34;hb=b8667492cf36a609939ee35ac42900ff0b0cc80f;hp=def9e1ae8691c8f8c50e9a867fd783aff7d6b03d;hpb=0192d9f3a127c82b32131d26ed9b5fb5a90db723;p=libucw.git

diff --git a/ucw/bitarray.h b/ucw/bitarray.h
index def9e1ae..78ee9d91 100644
--- a/ucw/bitarray.h
+++ b/ucw/bitarray.h
@@ -24,43 +24,43 @@ typedef u32 *bitarray_t; // Must be initialized by bit_array_xmalloc(), bit_arra
 #define BIT_ARRAY_BYTES(n) (4*BIT_ARRAY_WORDS(n))
 #define BIT_ARRAY(name,size) u32 name[BIT_ARRAY_WORDS(size)]
 
-static inline bitarray_t bit_array_xmalloc(uns n)
+static inline bitarray_t bit_array_xmalloc(uint n)
 {
   return xmalloc(BIT_ARRAY_BYTES(n));
 }
 
-bitarray_t bit_array_xrealloc(bitarray_t a, uns old_n, uns new_n);
+bitarray_t bit_array_xrealloc(bitarray_t a, uint old_n, uint new_n);
 
-static inline bitarray_t bit_array_xmalloc_zero(uns n)
+static inline bitarray_t bit_array_xmalloc_zero(uint n)
 {
   return xmalloc_zero(BIT_ARRAY_BYTES(n));
 }
 
-static inline void bit_array_zero(bitarray_t a, uns n)
+static inline void bit_array_zero(bitarray_t a, uint n)
 {
   bzero(a, BIT_ARRAY_BYTES(n));
 }
 
-static inline void bit_array_set_all(bitarray_t a, uns n)
+static inline void bit_array_set_all(bitarray_t a, uint n)
 {
-  uns w = n / 32;
+  uint w = n / 32;
   memset(a, 255, w * 4);
-  uns m = n & 31;
+  uint m = n & 31;
   if (m)
     a[w] = (1U << m) - 1;
 }
 
-static inline void bit_array_set(bitarray_t a, uns i)
+static inline void bit_array_set(bitarray_t a, uint i)
 {
   a[i/32] |= (1 << (i%32));
 }
 
-static inline void bit_array_clear(bitarray_t a, uns i)
+static inline void bit_array_clear(bitarray_t a, uint i)
 {
   a[i/32] &= ~(1 << (i%32));
 }
 
-static inline void bit_array_assign(bitarray_t a, uns i, uns x)
+static inline void bit_array_assign(bitarray_t a, uint i, uint x)
 {
   if (x)
     bit_array_set(a, i);
@@ -68,38 +68,38 @@ static inline void bit_array_assign(bitarray_t a, uns i, uns x)
     bit_array_clear(a, i);
 }
 
-static inline uns bit_array_isset(bitarray_t a, uns i)
+static inline uint bit_array_isset(bitarray_t a, uint i)
 {
   return a[i/32] & (1 << (i%32));
 }
 
-static inline uns bit_array_get(bitarray_t a, uns i)
+static inline uint bit_array_get(bitarray_t a, uint i)
 {
   return !! bit_array_isset(a, i);
 }
 
-static inline uns bit_array_test_and_set(bitarray_t a, uns i)
+static inline uint bit_array_test_and_set(bitarray_t a, uint i)
 {
-  uns t = bit_array_isset(a, i);
+  uint t = bit_array_isset(a, i);
   bit_array_set(a, i);
   return t;
 }
 
-static inline uns bit_array_test_and_clear(bitarray_t a, uns i)
+static inline uint bit_array_test_and_clear(bitarray_t a, uint i)
 {
-  uns t = bit_array_isset(a, i);
+  uint t = bit_array_isset(a, i);
   bit_array_clear(a, i);
   return t;
 }
 
-uns bit_array_count_bits(bitarray_t a, uns n);
+uint bit_array_count_bits(bitarray_t a, uint n);
 
 /* Iterate over all set bits */
 #define BIT_ARRAY_FISH_BITS_BEGIN(var,ary,size)					\
-  for (uns var##_hi=0; var##_hi < BIT_ARRAY_WORDS(size); var##_hi++)		\
+  for (uint var##_hi=0; var##_hi < BIT_ARRAY_WORDS(size); var##_hi++)		\
     {										\
       u32 var##_cur = ary[var##_hi];						\
-      for (uns var = 32 * var##_hi; var##_cur; var++, var##_cur >>= 1)		\
+      for (uint var = 32 * var##_hi; var##_cur; var++, var##_cur >>= 1)		\
         if (var##_cur & 1)							\
 	  do