From be8d99292164b5708998ce8d46424574fc866f80 Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Fri, 27 Jan 2006 18:21:30 +0000 Subject: [PATCH] Added bit_array_assign(), replaced BIT_ARRAY_ALLOC by functions. --- lib/bitarray.h | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/lib/bitarray.h b/lib/bitarray.h index 9e1de8d4..04ac582d 100644 --- a/lib/bitarray.h +++ b/lib/bitarray.h @@ -1,7 +1,7 @@ /* * UCW Library -- Bit Array Operations * - * (c) 2003--2004 Martin Mares + * (c) 2003--2006 Martin Mares * * This software may be freely distributed and used according to the terms * of the GNU Lesser General Public License. @@ -13,7 +13,18 @@ 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 +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) { -- 2.39.2