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
7428f512
Unverified
Commit
7428f512
authored
Apr 14, 2020
by
Salvatore Sanfilippo
Committed by
GitHub
Apr 14, 2020
Browse files
Merge pull request #7085 from guybe7/timeout_err_typo
Typo in getTimeoutFromObjectOrReply's error reply
parents
552b36e6
29760b2e
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/timeout.c
View file @
7428f512
...
...
@@ -166,7 +166,7 @@ int getTimeoutFromObjectOrReply(client *c, robj *object, mstime_t *timeout, int
if
(
unit
==
UNIT_SECONDS
)
{
if
(
getLongDoubleFromObjectOrReply
(
c
,
object
,
&
ftval
,
"timeout is not a
n
float or out of range"
)
!=
C_OK
)
"timeout is not a float or out of range"
)
!=
C_OK
)
return
C_ERR
;
tval
=
(
long
long
)
(
ftval
*
1000
.
0
);
}
else
{
...
...
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