summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Stancliff <matt@genges.com>2014-11-13 23:35:10 -0500
committerMatt Stancliff <matt@genges.com>2014-12-23 09:31:04 -0500
commitd956d809acb848aec0f6524e1337d274a635980d (patch)
treee5cda9046819453b85032f5c89bd2add6ce4cc20
parent9b786b124d6a547b87700114acdb9a617521a4bf (diff)
downloadredis-d956d809acb848aec0f6524e1337d274a635980d.tar.gz
Fix three simple clang analyzer warnings
-rw-r--r--src/rdb.c2
-rw-r--r--src/sentinel.c2
-rw-r--r--src/t_zset.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/rdb.c b/src/rdb.c
index 3dd69f289..325e5a62f 100644
--- a/src/rdb.c
+++ b/src/rdb.c
@@ -720,7 +720,7 @@ int rdbSave(char *filename) {
char tmpfile[256];
FILE *fp;
rio rdb;
- int error;
+ int error = 0;
snprintf(tmpfile,256,"temp-%d.rdb", (int) getpid());
fp = fopen(tmpfile,"w");
diff --git a/src/sentinel.c b/src/sentinel.c
index 33d970e57..c693a5862 100644
--- a/src/sentinel.c
+++ b/src/sentinel.c
@@ -577,7 +577,7 @@ void sentinelEvent(int level, char *type, sentinelRedisInstance *ri,
if (level == REDIS_WARNING && ri != NULL) {
sentinelRedisInstance *master = (ri->flags & SRI_MASTER) ?
ri : ri->master;
- if (master->notification_script) {
+ if (master && master->notification_script) {
sentinelScheduleScriptExecution(master->notification_script,
type,msg,NULL);
}
diff --git a/src/t_zset.c b/src/t_zset.c
index d3c7214bd..64418c9b4 100644
--- a/src/t_zset.c
+++ b/src/t_zset.c
@@ -1382,7 +1382,7 @@ void zremrangeGenericCommand(redisClient *c, int rangetype) {
robj *key = c->argv[1];
robj *zobj;
int keyremoved = 0;
- unsigned long deleted;
+ unsigned long deleted = 0;
zrangespec range;
zlexrangespec lexrange;
long start, end, llen;