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
2869284e
Commit
2869284e
authored
Dec 04, 2017
by
antirez
Browse files
Streams: fix a few type mismatches in t_stream.c.
parent
60d26acf
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/t_stream.c
View file @
2869284e
...
@@ -103,8 +103,10 @@ int64_t lpGetInteger(unsigned char *ele) {
...
@@ -103,8 +103,10 @@ int64_t lpGetInteger(unsigned char *ele) {
/* The following code path should never be used for how listpacks work:
/* The following code path should never be used for how listpacks work:
* they should always be able to store an int64_t value in integer
* they should always be able to store an int64_t value in integer
* encoded form. However the implementation may change. */
* encoded form. However the implementation may change. */
int
retval
=
string2ll
((
char
*
)
e
,
v
,
&
v
);
long
long
ll
;
int
retval
=
string2ll
((
char
*
)
e
,
v
,
&
ll
);
serverAssert
(
retval
!=
0
);
serverAssert
(
retval
!=
0
);
v
=
ll
;
return
v
;
return
v
;
}
}
...
@@ -748,7 +750,7 @@ int streamParseIDOrReply(client *c, robj *o, streamID *id, uint64_t missing_seq)
...
@@ -748,7 +750,7 @@ int streamParseIDOrReply(client *c, robj *o, streamID *id, uint64_t missing_seq)
/* Parse <ms>.<seq> form. */
/* Parse <ms>.<seq> form. */
char
*
dot
=
strchr
(
buf
,
'-'
);
char
*
dot
=
strchr
(
buf
,
'-'
);
if
(
dot
)
*
dot
=
'\0'
;
if
(
dot
)
*
dot
=
'\0'
;
u
int64_t
ms
,
seq
;
u
nsigned
long
long
ms
,
seq
;
if
(
string2ull
(
buf
,
&
ms
)
==
0
)
goto
invalid
;
if
(
string2ull
(
buf
,
&
ms
)
==
0
)
goto
invalid
;
if
(
dot
&&
string2ull
(
dot
+
1
,
&
seq
)
==
0
)
goto
invalid
;
if
(
dot
&&
string2ull
(
dot
+
1
,
&
seq
)
==
0
)
goto
invalid
;
if
(
!
dot
)
seq
=
missing_seq
;
if
(
!
dot
)
seq
=
missing_seq
;
...
...
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