diff options
author | antirez <antirez@gmail.com> | 2014-04-14 11:49:53 +0200 |
---|---|---|
committer | antirez <antirez@gmail.com> | 2014-04-14 11:49:53 +0200 |
commit | 837ca39081855bb1ea00e63f6cee642bffb35e71 (patch) | |
tree | d9969f11b785364a78346a17a2602dbc9935dbab /src/hyperloglog.c | |
parent | 142d133c8a9d83540b4543796ec108d913024304 (diff) | |
download | redis-837ca39081855bb1ea00e63f6cee642bffb35e71.tar.gz |
More robust HLL_SPARSE macros protecting 'p' with parens.
Now the macros will work with arguments such as "ptr+1".
Diffstat (limited to 'src/hyperloglog.c')
-rw-r--r-- | src/hyperloglog.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/hyperloglog.c b/src/hyperloglog.c index 92427ef5c..f7db2da21 100644 --- a/src/hyperloglog.c +++ b/src/hyperloglog.c @@ -361,13 +361,13 @@ struct hllhdr { * The macros parameter is expected to be an uint8_t pointer. */ #define HLL_SPARSE_XZERO_BIT 0x40 /* 01xxxxxx */ #define HLL_SPARSE_VAL_BIT 0x80 /* 1vvvvvxx */ -#define HLL_SPARSE_IS_ZERO(p) (((*p) & 0xc0) == 0) /* 00xxxxxx */ -#define HLL_SPARSE_IS_XZERO(p) (((*p) & 0xc0) == HLL_SPARSE_XZERO_BIT) -#define HLL_SPARSE_IS_VAL(p) ((*p) & HLL_SPARSE_VAL_BIT) -#define HLL_SPARSE_ZERO_LEN(p) (((*p) & 0x3f)+1) -#define HLL_SPARSE_XZERO_LEN(p) (((((*p) & 0x3f) << 8) | (*(p+1)))+1) -#define HLL_SPARSE_VAL_VALUE(p) ((((*p) >> 2) & 0x1f)+1) -#define HLL_SPARSE_VAL_LEN(p) (((*p) & 0x3)+1) +#define HLL_SPARSE_IS_ZERO(p) (((*(p)) & 0xc0) == 0) /* 00xxxxxx */ +#define HLL_SPARSE_IS_XZERO(p) (((*(p)) & 0xc0) == HLL_SPARSE_XZERO_BIT) +#define HLL_SPARSE_IS_VAL(p) ((*(p)) & HLL_SPARSE_VAL_BIT) +#define HLL_SPARSE_ZERO_LEN(p) (((*(p)) & 0x3f)+1) +#define HLL_SPARSE_XZERO_LEN(p) (((((*(p)) & 0x3f) << 8) | (*((p)+1)))+1) +#define HLL_SPARSE_VAL_VALUE(p) ((((*(p)) >> 2) & 0x1f)+1) +#define HLL_SPARSE_VAL_LEN(p) (((*(p)) & 0x3)+1) #define HLL_SPARSE_VAL_MAX_VALUE 32 #define HLL_SPARSE_VAL_MAX_LEN 4 #define HLL_SPARSE_ZERO_MAX_LEN 64 @@ -381,7 +381,7 @@ struct hllhdr { #define HLL_SPARSE_XZERO_SET(p,len) do { \ int _l = (len)-1; \ *(p) = (_l>>8) | HLL_SPARSE_XZERO_BIT; \ - *(p+1) = (_l&0xff); \ + *((p)+1) = (_l&0xff); \ } while(0) /* ========================= HyperLogLog algorithm ========================= */ |