Simplify redis#6379 changes.

jschmieg · Mar 24, 2020 · 42d39d4 · 42d39d4
1 parent 869c8db
commit 42d39d4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/src/aof.c b/src/aof.c
@@ -1149,10 +1149,7 @@ int rioWriteBulkStreamID(rio *r,streamID *id) {
     int retval;
 
     sds replyid = sdscatfmt(sdsempty(),"%U-%U",id->ms,id->seq);
-    if ((retval = rioWriteBulkString(r,replyid,sdslen(replyid))) == 0) {
-        sdsfree(replyid);
-        return 0;
-    }
+    retval = rioWriteBulkString(r,replyid,sdslen(replyid));
     sdsfree(replyid);
     return retval;
 }

diff --git a/src/cluster.c b/src/cluster.c
@@ -276,11 +276,9 @@ int clusterLoadConfig(char *filename) {
             } else {
                 start = stop = atoi(argv[j]);
             }
-            if (start < 0 || start >= CLUSTER_SLOTS) {
-                sdsfreesplitres(argv,argc);
-                goto fmterr;
-            }
-            if (stop < 0 || stop >= CLUSTER_SLOTS) {
+            if (start < 0 || start >= CLUSTER_SLOTS ||
+                stop < 0 || stop >= CLUSTER_SLOTS)
+            {
                 sdsfreesplitres(argv,argc);
                 goto fmterr;
             }