include: let BitIsOn() return a boolean value.
Simply returning the mask bit breaks checks like
BitIsOn(mask, 0) != BitIsOn(mask, 1);
as used in 048e93593e
.
The naming of this macro suggests that it should return boolean values
anyway. This patch also adds a few simple tests for these macros to make
sure they don't accidentally break in the future.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Pat Kane <pekane52@gmail.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
parent
4e0f8f666e
commit
42dc91e32a
|
@ -57,7 +57,7 @@ SOFTWARE.
|
||||||
#include "geext.h"
|
#include "geext.h"
|
||||||
#include "privates.h"
|
#include "privates.h"
|
||||||
|
|
||||||
#define BitIsOn(ptr, bit) (((BYTE *) (ptr))[(bit)>>3] & (1 << ((bit) & 7)))
|
#define BitIsOn(ptr, bit) (!!(((BYTE *) (ptr))[(bit)>>3] & (1 << ((bit) & 7))))
|
||||||
#define SetBit(ptr, bit) (((BYTE *) (ptr))[(bit)>>3] |= (1 << ((bit) & 7)))
|
#define SetBit(ptr, bit) (((BYTE *) (ptr))[(bit)>>3] |= (1 << ((bit) & 7)))
|
||||||
#define ClearBit(ptr, bit) (((BYTE *)(ptr))[(bit)>>3] &= ~(1 << ((bit) & 7)))
|
#define ClearBit(ptr, bit) (((BYTE *)(ptr))[(bit)>>3] &= ~(1 << ((bit) & 7)))
|
||||||
extern _X_EXPORT int CountBits(const uint8_t *mask, int len);
|
extern _X_EXPORT int CountBits(const uint8_t *mask, int len);
|
||||||
|
|
16
test/input.c
16
test/input.c
|
@ -1050,7 +1050,22 @@ static void dix_valuator_mode(void)
|
||||||
g_assert(valuator_get_mode(&dev, i) == Relative);
|
g_assert(valuator_get_mode(&dev, i) == Relative);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void include_bit_test_macros(void)
|
||||||
|
{
|
||||||
|
uint8_t mask[9] = { 0 };
|
||||||
|
int i;
|
||||||
|
|
||||||
|
for (i = 0; i < sizeof(mask)/sizeof(mask[0]); i++)
|
||||||
|
{
|
||||||
|
g_assert(BitIsOn(mask, i) == 0);
|
||||||
|
SetBit(mask, i);
|
||||||
|
g_assert(BitIsOn(mask, i) == 1);
|
||||||
|
g_assert(!!(mask[i/8] & (1 << (i % 8))));
|
||||||
|
g_assert(CountBits(mask, sizeof(mask)) == 1);
|
||||||
|
ClearBit(mask, i);
|
||||||
|
g_assert(BitIsOn(mask, i) == 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
int main(int argc, char** argv)
|
int main(int argc, char** argv)
|
||||||
{
|
{
|
||||||
|
@ -1066,6 +1081,7 @@ int main(int argc, char** argv)
|
||||||
g_test_add_func("/dix/input/grab_matching", dix_grab_matching);
|
g_test_add_func("/dix/input/grab_matching", dix_grab_matching);
|
||||||
g_test_add_func("/dix/input/valuator_mode", dix_valuator_mode);
|
g_test_add_func("/dix/input/valuator_mode", dix_valuator_mode);
|
||||||
g_test_add_func("/include/byte_padding_macros", include_byte_padding_macros);
|
g_test_add_func("/include/byte_padding_macros", include_byte_padding_macros);
|
||||||
|
g_test_add_func("/include/bit_test_macros", include_bit_test_macros);
|
||||||
g_test_add_func("/Xi/xiproperty/register-unregister", xi_unregister_handlers);
|
g_test_add_func("/Xi/xiproperty/register-unregister", xi_unregister_handlers);
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user