Unverified Commit 02dab200 authored by Salvatore Sanfilippo's avatar Salvatore Sanfilippo Committed by GitHub
Browse files

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

Fix compile some warnings
parents e5acc5ef 5a3d3d8b
...@@ -1965,7 +1965,7 @@ int rdbLoadRio(rio *rdb, rdbSaveInfo *rsi, int loading_aof) { ...@@ -1965,7 +1965,7 @@ int rdbLoadRio(rio *rdb, rdbSaveInfo *rsi, int loading_aof) {
} }
} else if (!strcasecmp(auxkey->ptr,"redis-ver")) { } else if (!strcasecmp(auxkey->ptr,"redis-ver")) {
serverLog(LL_NOTICE,"Loading RDB produced by version %s", serverLog(LL_NOTICE,"Loading RDB produced by version %s",
auxval->ptr); (char*)auxval->ptr);
} else if (!strcasecmp(auxkey->ptr,"ctime")) { } else if (!strcasecmp(auxkey->ptr,"ctime")) {
time_t age = time(NULL)-strtol(auxval->ptr,NULL,10); time_t age = time(NULL)-strtol(auxval->ptr,NULL,10);
if (age < 0) age = 0; if (age < 0) age = 0;
......
...@@ -2726,7 +2726,7 @@ static sds clusterManagerNodeGetJSON(clusterManagerNode *node, ...@@ -2726,7 +2726,7 @@ static sds clusterManagerNodeGetJSON(clusterManagerNode *node,
slots, slots,
node->slots_count, node->slots_count,
flags, flags,
node->current_epoch (unsigned long long)node->current_epoch
); );
if (error_count > 0) { if (error_count > 0) {
json = sdscatprintf(json, ",\n \"cluster_errors\": %lu", json = sdscatprintf(json, ",\n \"cluster_errors\": %lu",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment