gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix compiler warnings on Solaris

Browse Source
This commit is contained in:
Pieter Noordhuis 2010-12-23 11:25:56 +00:00
parent 89191613f1
commit 8ce39260a4
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/redis-cli.c
View File

@ -414,10 +414,11 @@ static sds cliFormatReplyRaw(redisReply *r) {
} }
static int cliReadReply(int output_raw_strings) { static int cliReadReply(int output_raw_strings) {
void *_reply;
redisReply *reply; redisReply *reply;
sds out; sds out;
if (redisGetReply(context,(void**)&reply) != REDIS_OK) { if (redisGetReply(context,&_reply) != REDIS_OK) {
if (config.shutdown) if (config.shutdown)
return REDIS_OK; return REDIS_OK;
if (config.interactive) { if (config.interactive) {
@ -431,6 +432,7 @@ static int cliReadReply(int output_raw_strings) {
return REDIS_ERR; /* avoid compiler warning */ return REDIS_ERR; /* avoid compiler warning */
} }
reply = (redisReply*)_reply;
if (output_raw_strings) { if (output_raw_strings) {
out = cliFormatReplyRaw(reply); out = cliFormatReplyRaw(reply);
} else { } else {

2
src/redis.c
View File

@ -1476,7 +1476,7 @@ void createPidFile(void) {
/* Try to write the pid file in a best-effort way. */ /* Try to write the pid file in a best-effort way. */
FILE *fp = fopen(server.pidfile,"w"); FILE *fp = fopen(server.pidfile,"w");
if (fp) { if (fp) {
fprintf(fp,"%d\n",getpid()); fprintf(fp,"%d\n",(int)getpid());
fclose(fp); fclose(fp);
} }
} }

6
src/ziplist.c
View File

@ -119,6 +119,7 @@ static unsigned int zipEntryEncoding(unsigned char *p) {
return p[0] & 0xf0; return p[0] & 0xf0;
} }
assert(NULL); assert(NULL);
return 0;
} }
/* Return bytes needed to store integer encoded by 'encoding' */ /* Return bytes needed to store integer encoded by 'encoding' */
@ -129,13 +130,14 @@ static unsigned int zipIntSize(unsigned char encoding) {
case ZIP_INT_64B: return sizeof(int64_t); case ZIP_INT_64B: return sizeof(int64_t);
} }
assert(NULL); assert(NULL);
return 0;
} }
/* Decode the encoded length pointed by 'p'. If a pointer to 'lensize' is /* Decode the encoded length pointed by 'p'. If a pointer to 'lensize' is
* provided, it is set to the number of bytes required to encode the length. */ * provided, it is set to the number of bytes required to encode the length. */
static unsigned int zipDecodeLength(unsigned char *p, unsigned int *lensize) { static unsigned int zipDecodeLength(unsigned char *p, unsigned int *lensize) {
unsigned char encoding = zipEntryEncoding(p); unsigned char encoding = zipEntryEncoding(p);
unsigned int len; unsigned int len = 0;
if (ZIP_IS_STR(encoding)) { if (ZIP_IS_STR(encoding)) {
switch(encoding) { switch(encoding) {
@ -300,7 +302,7 @@ static void zipSaveInteger(unsigned char *p, int64_t value, unsigned char encodi
static int64_t zipLoadInteger(unsigned char *p, unsigned char encoding) { static int64_t zipLoadInteger(unsigned char *p, unsigned char encoding) {
int16_t i16; int16_t i16;
int32_t i32; int32_t i32;
int64_t i64, ret; int64_t i64, ret = 0;
if (encoding == ZIP_INT_16B) { if (encoding == ZIP_INT_16B) {
memcpy(&i16,p,sizeof(i16)); memcpy(&i16,p,sizeof(i16));
ret = i16; ret = i16;