caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-23 08:38:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add casting to match printf format.

Browse Source 
adjustOpenFilesLimit() and clusterUpdateSlotsWithConfig() that were
assuming uint64_t is the same as unsigned long long, which is true
probably for all the systems out there that we target, but still GCC
emitted a warning since technically they are two different types.
This commit is contained in:
antirez 2014-04-07 08:57:05 +02:00
parent 3a6a1e42f1
commit 67bb2c46b2
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/cluster.c
View File

@ -1178,8 +1178,9 @@ void clusterUpdateSlotsConfigWith(clusterNode *sender, uint64_t senderConfigEpoc
"I've still keys about this slot! " "I've still keys about this slot! "
"Putting the slot in IMPORTING state. " "Putting the slot in IMPORTING state. "
"Please run the 'redis-trib fix' command.", "Please run the 'redis-trib fix' command.",
j, sender->name, senderConfigEpoch, j, sender->name,
myself->configEpoch); (unsigned long long) senderConfigEpoch,
(unsigned long long) myself->configEpoch);
server.cluster->importing_slots_from[j] = sender; server.cluster->importing_slots_from[j] = sender;
} }

14
src/redis.c
View File

@ -1555,24 +1555,28 @@ void adjustOpenFilesLimit(void) {
redisLog(REDIS_WARNING,"Your current 'ulimit -n' " redisLog(REDIS_WARNING,"Your current 'ulimit -n' "
"of %llu is not enough for Redis to start. " "of %llu is not enough for Redis to start. "
"Please increase your open file limit to at least " "Please increase your open file limit to at least "
"%llu. Exiting.", oldlimit, maxfiles); "%llu. Exiting.",
(unsigned long long) oldlimit,
(unsigned long long) maxfiles);
exit(1); exit(1);
} }
redisLog(REDIS_WARNING,"You requested maxclients of %d " redisLog(REDIS_WARNING,"You requested maxclients of %d "
"requiring at least %llu max file descriptors.", "requiring at least %llu max file descriptors.",
old_maxclients, maxfiles); old_maxclients,
(unsigned long long) maxfiles);
redisLog(REDIS_WARNING,"Redis can't set maximum open files " redisLog(REDIS_WARNING,"Redis can't set maximum open files "
"to %llu because of OS error: %s.", "to %llu because of OS error: %s.",
maxfiles, strerror(setrlimit_error)); (unsigned long long) maxfiles, strerror(setrlimit_error));
redisLog(REDIS_WARNING,"Current maximum open files is %llu. " redisLog(REDIS_WARNING,"Current maximum open files is %llu. "
"maxclients has been reduced to %d to compensate for " "maxclients has been reduced to %d to compensate for "
"low ulimit. " "low ulimit. "
"If you need higher maxclients increase 'ulimit -n'.", "If you need higher maxclients increase 'ulimit -n'.",
oldlimit, server.maxclients); (unsigned long long) oldlimit, server.maxclients);
} else { } else {
redisLog(REDIS_NOTICE,"Increased maximum number of open files " redisLog(REDIS_NOTICE,"Increased maximum number of open files "
"to %llu (it was originally set to %llu).", "to %llu (it was originally set to %llu).",
maxfiles, oldlimit); (unsigned long long) maxfiles,
(unsigned long long) oldlimit);
} }
} }
} }