diff options
| author | Salvatore Sanfilippo <antirez@gmail.com> | 2013-05-08 00:49:33 -0700 |
|---|---|---|
| committer | Salvatore Sanfilippo <antirez@gmail.com> | 2013-05-08 00:49:33 -0700 |
| commit | c1ae7d2377d716bec7d064fff71ea37a66293f48 (patch) | |
| tree | a16fdc8250588bd8d1c4eac7c66650bc0e44588b | |
| parent | 5885a34b671ed873f529dd9798d2b0904e3f5428 (diff) | |
| parent | 2c75f2cf1aa0d9cc8256517bd6f3d8a82088ee1a (diff) | |
| download | redis-c1ae7d2377d716bec7d064fff71ea37a66293f48.tar.gz | |
Merge pull request #1093 from july2993/unstable
in 32bit machine, popcount don't work with a input string length up to 5...
| -rw-r--r-- | src/bitops.c | 4 | ||||
| -rw-r--r-- | src/redis.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/bitops.c b/src/bitops.c index f2d03f9b0..70146af37 100644 --- a/src/bitops.c +++ b/src/bitops.c @@ -58,8 +58,8 @@ static int getBitOffsetFromArgument(redisClient *c, robj *o, size_t *offset) { /* Count number of bits set in the binary array pointed by 's' and long * 'count' bytes. The implementation of this function is required to * work with a input string length up to 512 MB. */ -long popcount(void *s, long count) { - long bits = 0; +long long popcount(void *s, long count) { + long long bits = 0; unsigned char *p; uint32_t *p4 = s; static const unsigned char bitsinbyte[256] = {0,1,1,2,1,2,2,3,1,2,2,3,2,3,3,4,1,2,2,3,2,3,3,4,2,3,3,4,3,4,4,5,1,2,2,3,2,3,3,4,2,3,3,4,3,4,4,5,2,3,3,4,3,4,4,5,3,4,4,5,4,5,5,6,1,2,2,3,2,3,3,4,2,3,3,4,3,4,4,5,2,3,3,4,3,4,4,5,3,4,4,5,4,5,5,6,2,3,3,4,3,4,4,5,3,4,4,5,4,5,5,6,3,4,4,5,4,5,5,6,4,5,5,6,5,6,6,7,1,2,2,3,2,3,3,4,2,3,3,4,3,4,4,5,2,3,3,4,3,4,4,5,3,4,4,5,4,5,5,6,2,3,3,4,3,4,4,5,3,4,4,5,4,5,5,6,3,4,4,5,4,5,5,6,4,5,5,6,5,6,6,7,2,3,3,4,3,4,4,5,3,4,4,5,4,5,5,6,3,4,4,5,4,5,5,6,4,5,5,6,5,6,6,7,3,4,4,5,4,5,5,6,4,5,5,6,5,6,6,7,4,5,5,6,5,6,6,7,5,6,6,7,6,7,7,8}; diff --git a/src/redis.h b/src/redis.h index e0fe50ffb..d5ddfb8c5 100644 --- a/src/redis.h +++ b/src/redis.h @@ -984,7 +984,7 @@ long long mstime(void); void getRandomHexChars(char *p, unsigned int len); uint64_t crc64(uint64_t crc, const unsigned char *s, uint64_t l); void exitFromChild(int retcode); -long popcount(void *s, long count); +long long popcount(void *s, long count); void redisSetProcTitle(char *title); /* networking.c -- Networking and Client related operations */ |