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
02dab200
Unverified
Commit
02dab200
authored
Mar 13, 2019
by
Salvatore Sanfilippo
Committed by
GitHub
Mar 13, 2019
Browse files
Merge pull request #5894 from soloestoy/fix-rdb-warning
Fix compile some warnings
parents
e5acc5ef
5a3d3d8b
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/rdb.c
View file @
02dab200
...
@@ -1965,7 +1965,7 @@ int rdbLoadRio(rio *rdb, rdbSaveInfo *rsi, int loading_aof) {
...
@@ -1965,7 +1965,7 @@ int rdbLoadRio(rio *rdb, rdbSaveInfo *rsi, int loading_aof) {
}
}
}
else
if
(
!
strcasecmp
(
auxkey
->
ptr
,
"redis-ver"
))
{
}
else
if
(
!
strcasecmp
(
auxkey
->
ptr
,
"redis-ver"
))
{
serverLog
(
LL_NOTICE
,
"Loading RDB produced by version %s"
,
serverLog
(
LL_NOTICE
,
"Loading RDB produced by version %s"
,
auxval
->
ptr
);
(
char
*
)
auxval
->
ptr
);
}
else
if
(
!
strcasecmp
(
auxkey
->
ptr
,
"ctime"
))
{
}
else
if
(
!
strcasecmp
(
auxkey
->
ptr
,
"ctime"
))
{
time_t
age
=
time
(
NULL
)
-
strtol
(
auxval
->
ptr
,
NULL
,
10
);
time_t
age
=
time
(
NULL
)
-
strtol
(
auxval
->
ptr
,
NULL
,
10
);
if
(
age
<
0
)
age
=
0
;
if
(
age
<
0
)
age
=
0
;
...
...
src/redis-cli.c
View file @
02dab200
...
@@ -2726,7 +2726,7 @@ static sds clusterManagerNodeGetJSON(clusterManagerNode *node,
...
@@ -2726,7 +2726,7 @@ static sds clusterManagerNodeGetJSON(clusterManagerNode *node,
slots
,
slots
,
node
->
slots_count
,
node
->
slots_count
,
flags
,
flags
,
node
->
current_epoch
(
unsigned
long
long
)
node
->
current_epoch
);
);
if
(
error_count
>
0
)
{
if
(
error_count
>
0
)
{
json
=
sdscatprintf
(
json
,
",
\n
\"
cluster_errors
\"
: %lu"
,
json
=
sdscatprintf
(
json
,
",
\n
\"
cluster_errors
\"
: %lu"
,
...
...
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