diff options
author | antirez <antirez@gmail.com> | 2012-07-18 12:01:43 +0200 |
---|---|---|
committer | antirez <antirez@gmail.com> | 2012-07-18 12:04:58 +0200 |
commit | b62bdf1c643ee8ace697621464ee201300ee2f0e (patch) | |
tree | 914c2fc71784f68f8abc27062db5b7774495933b /src/ziplist.c | |
parent | a2db8e4801968c5a5a163390aec17027810bae38 (diff) | |
download | redis-b62bdf1c643ee8ace697621464ee201300ee2f0e.tar.gz |
Don't assume that "char" is signed.
For the C standard char can be either signed or unsigned, it's up to the
compiler, but Redis assumed that it was signed in a few places.
The practical effect of this patch is that now Redis 2.6 will run
correctly in every system where char is unsigned, notably the RaspBerry
PI and other ARM systems with GCC.
Thanks to Georgi Marinov (@eesn on twitter) that reported the problem
and allowed me to use his RaspBerry via SSH to trace and fix the issue!
Diffstat (limited to 'src/ziplist.c')
-rw-r--r-- | src/ziplist.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ziplist.c b/src/ziplist.c index 50167651b..76a2cdde0 100644 --- a/src/ziplist.c +++ b/src/ziplist.c @@ -317,7 +317,7 @@ static void zipSaveInteger(unsigned char *p, int64_t value, unsigned char encodi int32_t i32; int64_t i64; if (encoding == ZIP_INT_8B) { - ((char*)p)[0] = (char)value; + ((int8_t*)p)[0] = (int8_t)value; } else if (encoding == ZIP_INT_16B) { i16 = value; memcpy(p,&i16,sizeof(i16)); @@ -325,7 +325,7 @@ static void zipSaveInteger(unsigned char *p, int64_t value, unsigned char encodi } else if (encoding == ZIP_INT_24B) { i32 = value<<8; memrev32ifbe(&i32); - memcpy(p,((unsigned char*)&i32)+1,sizeof(i32)-sizeof(int8_t)); + memcpy(p,((uint8_t*)&i32)+1,sizeof(i32)-sizeof(uint8_t)); } else if (encoding == ZIP_INT_32B) { i32 = value; memcpy(p,&i32,sizeof(i32)); @@ -347,7 +347,7 @@ static int64_t zipLoadInteger(unsigned char *p, unsigned char encoding) { int32_t i32; int64_t i64, ret = 0; if (encoding == ZIP_INT_8B) { - ret = ((char*)p)[0]; + ret = ((int8_t*)p)[0]; } else if (encoding == ZIP_INT_16B) { memcpy(&i16,p,sizeof(i16)); memrev16ifbe(&i16); @@ -358,7 +358,7 @@ static int64_t zipLoadInteger(unsigned char *p, unsigned char encoding) { ret = i32; } else if (encoding == ZIP_INT_24B) { i32 = 0; - memcpy(((unsigned char*)&i32)+1,p,sizeof(i32)-sizeof(int8_t)); + memcpy(((uint8_t*)&i32)+1,p,sizeof(i32)-sizeof(uint8_t)); memrev32ifbe(&i32); ret = i32>>8; } else if (encoding == ZIP_INT_64B) { |