From 632688e8d6cde32781e4ec685d59afb0938300ad Mon Sep 17 00:00:00 2001 From: Stijn Tintel Date: Thu, 17 Aug 2017 15:50:03 +0200 Subject: [PATCH] utils: nuke bitfield functions and macros The bitfield functions and macros were committed without explaining their purpose in the commit message. As they are only used in uci, and conflict with similar functions added in hostapd, breaking our hostapd ubus patch, nuke them from libubox and add them in uci instead. If we need them anywhere else in the future we can add it to libubox again, but preferably prefixed with ubox_. Signed-off-by: Stijn Tintel --- utils.h | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/utils.h b/utils.h index cd09cc0..e72d947 100644 --- a/utils.h +++ b/utils.h @@ -170,22 +170,6 @@ static inline uint16_t __u_bswap16(uint16_t val) #define __hidden __attribute__((visibility("hidden"))) #endif -#ifndef BITS_PER_LONG -#define BITS_PER_LONG (8 * sizeof(unsigned long)) -#endif - -#define BITFIELD_SIZE(_n) (((_n) + (BITS_PER_LONG - 1)) / BITS_PER_LONG) - -static inline void bitfield_set(unsigned long *bits, int bit) -{ - bits[bit / BITS_PER_LONG] |= (1UL << (bit % BITS_PER_LONG)); -} - -static inline bool bitfield_test(unsigned long *bits, int bit) -{ - return !!(bits[bit / BITS_PER_LONG] & (1UL << (bit % BITS_PER_LONG))); -} - int b64_encode(const void *src, size_t src_len, void *dest, size_t dest_len); -- 2.25.1