summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorantirez <antirez@gmail.com>2013-06-26 15:19:06 +0200
committerantirez <antirez@gmail.com>2013-06-26 15:19:06 +0200
commit13585dd677ab3401a395858e86cd2dbc626a211b (patch)
treece745d901a51b531320771c32f3aeaecdb9ae428
parentbae60ede1d60687f1240258c9298d3515b24b091 (diff)
downloadredis-13585dd677ab3401a395858e86cd2dbc626a211b.tar.gz
function renamed: popcount_binary -> redisPopcount.
-rw-r--r--src/bitops.c4
-rw-r--r--src/redis.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/bitops.c b/src/bitops.c
index 1c2e13ddc..c96a9e3c7 100644
--- a/src/bitops.c
+++ b/src/bitops.c
@@ -58,7 +58,7 @@ 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. */
-size_t popcount_binary(void *s, long count) {
+size_t redisPopcount(void *s, long count) {
size_t bits = 0;
unsigned char *p;
uint32_t *p4 = s;
@@ -407,6 +407,6 @@ void bitcountCommand(redisClient *c) {
} else {
long bytes = end-start+1;
- addReplyLongLong(c,popcount_binary(p+start,bytes));
+ addReplyLongLong(c,redisPopcount(p+start,bytes));
}
}
diff --git a/src/redis.h b/src/redis.h
index ccf978128..78d97ca22 100644
--- a/src/redis.h
+++ b/src/redis.h
@@ -1029,7 +1029,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);
-size_t popcount_binary(void *s, long count);
+size_t redisPopcount(void *s, long count);
void redisSetProcTitle(char *title);
/* networking.c -- Networking and Client related operations */