From fb81d1b3f891746e886f44cad5df96a29e6b9f51 Mon Sep 17 00:00:00 2001 From: "zhaozhao.zz" Date: Mon, 4 Mar 2019 19:43:00 +0800 Subject: [PATCH 1/2] Fix compile warning when log aux field --- src/rdb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rdb.c b/src/rdb.c index b800ee48..52dddf21 100644 --- a/src/rdb.c +++ b/src/rdb.c @@ -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; From 5a3d3d8be414d201abb670313f2801aeadd9ba69 Mon Sep 17 00:00:00 2001 From: "zhaozhao.zz" Date: Wed, 13 Mar 2019 16:54:34 +0800 Subject: [PATCH 2/2] Fix compile warning in redis-cli.c --- src/redis-cli.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redis-cli.c b/src/redis-cli.c index 0e52c16b..5414de7e 100644 --- a/src/redis-cli.c +++ b/src/redis-cli.c @@ -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",