Just need long, not long int

michael-grunder · michael-grunder · commit 433035d1536d · 2016-01-12T08:37:55.000-08:00
diff --git a/library.c b/library.c
@@ -201,7 +201,7 @@ redis_sock_read_scan_reply(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
                            REDIS_SCAN_TYPE type, long *iter)
 {
     REDIS_REPLY_TYPE reply_type;
-    int reply_info;
+    long reply_info;
     char *p_iter;
 
     /* Our response should have two multibulk replies */
@@ -2138,8 +2138,8 @@ redis_sock_gets(RedisSock *redis_sock, char *buf, int buf_size,
 }
 
 PHP_REDIS_API int
-redis_read_reply_type(RedisSock *redis_sock, REDIS_REPLY_TYPE *reply_type,
-                      int *reply_info TSRMLS_DC)
+redis_read_reply_type(RedisSock *redis_sock, REDIS_REPLY_TYPE *reply_type, 
+                      long *reply_info TSRMLS_DC)
 {
     // Make sure we haven't lost the connection, even trying to reconnect
     if(-1 == redis_check_eof(redis_sock, 0 TSRMLS_CC)) {
@@ -2167,7 +2167,7 @@ redis_read_reply_type(RedisSock *redis_sock, REDIS_REPLY_TYPE *reply_type,
 		}
 
 		/* Set our size response */
-		*reply_info = atoi(inbuf);
+		*reply_info = atol(inbuf);
 	}
 
 	/* Success! */
@@ -2230,7 +2230,7 @@ PHP_REDIS_API int
 redis_read_multibulk_recursive(RedisSock *redis_sock, int elements, zval **z_ret
                                TSRMLS_DC)
 {
-    int reply_info;
+    long reply_info;
     REDIS_REPLY_TYPE reply_type;
     zval z_subelem, *z_subelem_p;
 	z_subelem_p = &z_subelem;
@@ -2291,7 +2291,7 @@ redis_read_variant_reply(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
 {
     // Reply type, and reply size vars
     REDIS_REPLY_TYPE reply_type;
-    int reply_info;
+    long reply_info;
     //char *bulk_resp;
     zval z_ret, *z_ret_p;
 	z_ret_p = &z_ret;
diff --git a/library.h b/library.h
@@ -76,7 +76,7 @@ PHP_REDIS_API int redis_sock_set_err(RedisSock *redis_sock, const char *msg, int
 * Variant Read methods, mostly to implement eval
 */
 
-PHP_REDIS_API int redis_read_reply_type(RedisSock *redis_sock, REDIS_REPLY_TYPE *reply_type, int *reply_info TSRMLS_DC);
+PHP_REDIS_API int redis_read_reply_type(RedisSock *redis_sock, REDIS_REPLY_TYPE *reply_type, long *reply_info TSRMLS_DC);
 PHP_REDIS_API int redis_read_variant_line(RedisSock *redis_sock, REDIS_REPLY_TYPE reply_type, zval **z_ret TSRMLS_DC);
 PHP_REDIS_API int redis_read_variant_bulk(RedisSock *redis_sock, int size, zval **z_ret TSRMLS_DC);
 PHP_REDIS_API int redis_read_multibulk_recursive(RedisSock *redis_sock, int elements, zval **z_ret TSRMLS_DC);

Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ redis_sock_read_scan_reply(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,`
`201`	`201`	`REDIS_SCAN_TYPE type, long *iter)`
`202`	`202`	`{`
`203`	`203`	`REDIS_REPLY_TYPE reply_type;`
`204`		`- int reply_info;`
	`204`	`+ long reply_info;`
`205`	`205`	`char *p_iter;`
`206`	`206`
`207`	`207`	`/* Our response should have two multibulk replies */`
`@@ -2138,8 +2138,8 @@ redis_sock_gets(RedisSock redis_sock, char buf, int buf_size,`
`2138`	`2138`	`}`
`2139`	`2139`
`2140`	`2140`	`PHP_REDIS_API int`
`2141`		`-redis_read_reply_type(RedisSock redis_sock, REDIS_REPLY_TYPE reply_type,`
`2142`		`- int *reply_info TSRMLS_DC)`
	`2141`	`+redis_read_reply_type(RedisSock redis_sock, REDIS_REPLY_TYPE reply_type,`
	`2142`	`+ long *reply_info TSRMLS_DC)`
`2143`	`2143`	`{`
`2144`	`2144`	`// Make sure we haven't lost the connection, even trying to reconnect`
`2145`	`2145`	`if(-1 == redis_check_eof(redis_sock, 0 TSRMLS_CC)) {`
`@@ -2167,7 +2167,7 @@ redis_read_reply_type(RedisSock redis_sock, REDIS_REPLY_TYPE reply_type,`
`2167`	`2167`	`}`
`2168`	`2168`
`2169`	`2169`	`/* Set our size response */`
`2170`		`- *reply_info = atoi(inbuf);`
	`2170`	`+ *reply_info = atol(inbuf);`
`2171`	`2171`	`}`
`2172`	`2172`
`2173`	`2173`	`/* Success! */`
`@@ -2230,7 +2230,7 @@ PHP_REDIS_API int`
`2230`	`2230`	`redis_read_multibulk_recursive(RedisSock redis_sock, int elements, zval *z_ret`
`2231`	`2231`	`TSRMLS_DC)`
`2232`	`2232`	`{`
`2233`		`- int reply_info;`
	`2233`	`+ long reply_info;`
`2234`	`2234`	`REDIS_REPLY_TYPE reply_type;`
`2235`	`2235`	`zval z_subelem, *z_subelem_p;`
`2236`	`2236`	`z_subelem_p = &z_subelem;`
`@@ -2291,7 +2291,7 @@ redis_read_variant_reply(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,`
`2291`	`2291`	`{`
`2292`	`2292`	`// Reply type, and reply size vars`
`2293`	`2293`	`REDIS_REPLY_TYPE reply_type;`
`2294`		`- int reply_info;`
	`2294`	`+ long reply_info;`
`2295`	`2295`	`//char *bulk_resp;`
`2296`	`2296`	`zval z_ret, *z_ret_p;`
`2297`	`2297`	`z_ret_p = &z_ret;`