Merge with 3.8 (my small changes due to trying to release the free version)

[libucw.git] / lib / bitarray.h

diff --git a/lib/bitarray.h b/lib/bitarray.h
index 216acd98ee8535cb36c612d67059294414bf5f46..04ac582d04a3ecea43938c351081159383facf9c 100644 (file)
--- a/lib/bitarray.h
+++ b/lib/bitarray.h
@@ -1,7 +1,7 @@
 /*
- *     Bit Array Operations
+ *     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.
@@ -14,12 +14,30 @@ typedef u32 *bitarray_t;
 #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_set_all(bitarray_t a, uns n)
+{
+  memset(a, 255, BIT_ARRAY_BYTES(n));
+}
+
 static inline void
 bit_array_set(bitarray_t a, uns i)
 {
@@ -32,6 +50,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)
 {