X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fbitarray.h;h=724804154e58349b94bca592667edd2d0b200949;hb=8ab69f51fccccbcae521bd7f7e3ae27146fd1217;hp=9e1de8d49b5117cf2ed46e1f084730d384f7f906;hpb=77c888a5fe147f4b63d5468482bb06470f50f244;p=libucw.git

diff --git a/lib/bitarray.h b/lib/bitarray.h
index 9e1de8d4..72480415 100644
--- a/lib/bitarray.h
+++ b/lib/bitarray.h
@@ -1,19 +1,33 @@
 /*
  *	UCW Library -- Bit Array Operations
  *
- *	(c) 2003--2004 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)]
-#define BIT_ARRAY_ALLOC(size) ((bitarray_t) xmalloc(BIT_ARRAY_BYTES(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)
@@ -39,6 +53,15 @@ 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(bitarray_t a, uns i)
 {
@@ -80,3 +103,5 @@ bit_array_test_and_clear(bitarray_t a, uns i)
 #define BIT_ARRAY_FISH_BITS_END							\
 	  while (0);								\
 	}
+
+#endif