Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
28d146be
Commit
28d146be
authored
Jan 13, 2020
by
antirez
Browse files
Simplify #6379 changes.
parent
9506c860
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/aof.c
View file @
28d146be
...
@@ -1149,10 +1149,7 @@ int rioWriteBulkStreamID(rio *r,streamID *id) {
...
@@ -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
;
}
}
...
...
src/cluster.c
View file @
28d146be
...
@@ -276,11 +276,9 @@ int clusterLoadConfig(char *filename) {
...
@@ -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
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment