Simplify #6379 changes.
This commit is contained in:
parent
658749cc54
commit
cbabf779c2
@ -1149,10 +1149,7 @@ int rioWriteBulkStreamID(rio *r,streamID *id) {
|
|||||||
int retval;
|
int retval;
|
||||||
|
|
||||||
sds replyid = sdscatfmt(sdsempty(),"%U-%U",id->ms,id->seq);
|
sds replyid = sdscatfmt(sdsempty(),"%U-%U",id->ms,id->seq);
|
||||||
if ((retval = rioWriteBulkString(r,replyid,sdslen(replyid))) == 0) {
|
retval = rioWriteBulkString(r,replyid,sdslen(replyid));
|
||||||
sdsfree(replyid);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
sdsfree(replyid);
|
sdsfree(replyid);
|
||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
|
@ -276,11 +276,9 @@ int clusterLoadConfig(char *filename) {
|
|||||||
} else {
|
} else {
|
||||||
start = stop = atoi(argv[j]);
|
start = stop = atoi(argv[j]);
|
||||||
}
|
}
|
||||||
if (start < 0 || start >= CLUSTER_SLOTS) {
|
if (start < 0 || start >= CLUSTER_SLOTS ||
|
||||||
sdsfreesplitres(argv,argc);
|
stop < 0 || stop >= CLUSTER_SLOTS)
|
||||||
goto fmterr;
|
{
|
||||||
}
|
|
||||||
if (stop < 0 || stop >= CLUSTER_SLOTS) {
|
|
||||||
sdsfreesplitres(argv,argc);
|
sdsfreesplitres(argv,argc);
|
||||||
goto fmterr;
|
goto fmterr;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user