X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fbitarray.h;h=724804154e58349b94bca592667edd2d0b200949;hb=e371dcc1cd2857036374dd9597705faed0427006;hp=39340d1b06a7f904701d1cd9bbcf59730c6d4d29;hpb=54eb231d1d8fcb8b02c56d437152699764bcda3e;p=libucw.git

diff --git a/lib/bitarray.h b/lib/bitarray.h
index 39340d1b..72480415 100644
--- a/lib/bitarray.h
+++ b/lib/bitarray.h
@@ -1,49 +1,81 @@
 /*
- *	Bit Array Operations
+ *	UCW Library -- Bit Array Operations
  *
- *	(c) 2003 Martin Mares <mj@ucw.cz>
+ *	(c) 2003--2006 Martin Mares <mj@ucw.cz>
  *
  *	This software may be freely distributed and used according to the terms
  *	of the GNU Lesser General Public License.
  */
 
+#ifndef _UCW_BITARRAY_H
+#define _UCW_BITARRAY_H
+
 #include <string.h>
 
+typedef u32 *bitarray_t;
 #define BIT_ARRAY_WORDS(n) (((n)+31)/32)
+#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)
+{
+  return xmalloc(BIT_ARRAY_BYTES(n));
+}
+
+static inline bitarray_t
+bit_array_xmalloc_zero(uns n)
+{
+  return xmalloc_zero(BIT_ARRAY_BYTES(n));
+}
+
+static inline void
+bit_array_zero(bitarray_t a, uns n)
+{
+  bzero(a, BIT_ARRAY_BYTES(n));
+}
+
 static inline void
-bit_array_zero(u32 *a, uns n)
+bit_array_set_all(bitarray_t a, uns n)
 {
-  bzero(a, 4*BIT_ARRAY_WORDS(n));
+  memset(a, 255, BIT_ARRAY_BYTES(n));
 }
 
 static inline void
-bit_array_set(u32 *a, uns i)
+bit_array_set(bitarray_t a, uns i)
 {
   a[i/32] |= (1 << (i%32));
 }
 
 static inline void
-bit_array_clear(u32 *a, uns i)
+bit_array_clear(bitarray_t a, uns i)
 {
   a[i/32] &= ~(1 << (i%32));
 }
 
+static inline void
+bit_array_assign(bitarray_t a, uns i, uns x)
+{
+  if (x)
+    bit_array_set(a, i);
+  else
+    bit_array_clear(a, i);
+}
+
 static inline uns
-bit_array_isset(u32 *a, uns i)
+bit_array_isset(bitarray_t a, uns i)
 {
   return a[i/32] & (1 << (i%32));
 }
 
 static inline uns
-bit_array_get(u32 *a, uns i)
+bit_array_get(bitarray_t a, uns i)
 {
   return !! bit_array_isset(a, i);
 }
 
 static inline uns
-bit_array_test_and_set(u32 *a, uns i)
+bit_array_test_and_set(bitarray_t a, uns i)
 {
   uns t = bit_array_isset(a, i);
   bit_array_set(a, i);
@@ -51,7 +83,7 @@ bit_array_test_and_set(u32 *a, uns i)
 }
 
 static inline uns
-bit_array_test_and_clear(u32 *a, uns i)
+bit_array_test_and_clear(bitarray_t a, uns i)
 {
   uns t = bit_array_isset(a, i);
   bit_array_clear(a, i);
@@ -71,3 +103,5 @@ bit_array_test_and_clear(u32 *a, uns i)
 #define BIT_ARRAY_FISH_BITS_END							\
 	  while (0);								\
 	}
+
+#endif