Merge pull request #5894 from soloestoy/fix-rdb-warning

Fix compile some warnings
This commit is contained in:
Salvatore Sanfilippo 2019-03-13 11:47:48 +01:00 committed by GitHub
commit e73f7b3a84
2 changed files with 2 additions and 2 deletions

View File

@ -1965,7 +1965,7 @@ int rdbLoadRio(rio *rdb, rdbSaveInfo *rsi, int loading_aof) {
}
} else if (!strcasecmp(auxkey->ptr,"redis-ver")) {
serverLog(LL_NOTICE,"Loading RDB produced by version %s",
auxval->ptr);
(char*)auxval->ptr);
} else if (!strcasecmp(auxkey->ptr,"ctime")) {
time_t age = time(NULL)-strtol(auxval->ptr,NULL,10);
if (age < 0) age = 0;

View File

@ -2726,7 +2726,7 @@ static sds clusterManagerNodeGetJSON(clusterManagerNode *node,
slots,
node->slots_count,
flags,
node->current_epoch
(unsigned long long)node->current_epoch
);
if (error_count > 0) {
json = sdscatprintf(json, ",\n \"cluster_errors\": %lu",