From 2869284e44ca64d633a75752981333d5c0520056 Mon Sep 17 00:00:00 2001
From: antirez <antirez@gmail.com>
Date: Mon, 4 Dec 2017 11:59:15 +0100
Subject: Streams: fix a few type mismatches in t_stream.c.

---
 src/t_stream.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/t_stream.c b/src/t_stream.c
index 213a46bb1..da9939588 100644
--- a/src/t_stream.c
+++ b/src/t_stream.c
@@ -103,8 +103,10 @@ int64_t lpGetInteger(unsigned char *ele) {
     /* 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
      * 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);
+    v = ll;
     return v;
 }
 
@@ -748,7 +750,7 @@ int streamParseIDOrReply(client *c, robj *o, streamID *id, uint64_t missing_seq)
     /* Parse <ms>.<seq> form. */
     char *dot = strchr(buf,'-');
     if (dot) *dot = '\0';
-    uint64_t ms, seq;
+    unsigned long long ms, seq;
     if (string2ull(buf,&ms) == 0) goto invalid;
     if (dot && string2ull(dot+1,&seq) == 0) goto invalid;
     if (!dot) seq = missing_seq;
-- 
cgit v1.2.1