Cleaner handling of large values on 32-bits.

nicolasff · nicolasff · commit f8f552e3b24c · 2012-05-17T22:45:32.000+01:00
Tested on 32-bits, addresses GitHub issue phpredis#174.
diff --git a/common.h b/common.h
@@ -4,24 +4,6 @@
 #ifndef REDIS_COMMON_H
 #define REDIS_COMMON_H
 
-/* Check windows */
-#if _WIN32 || _WIN64
-#if _WIN64
-#define PHP64
-#else
-#define PHP32
-#endif
-#endif
-
-/* Check GCC and Clang */
-#if __GNUC__
-#if __x86_64__ || __ppc64__
-#define PHP64
-#else
-#define PHP32
-#endif
-#endif
-
 #define redis_sock_name "Redis Socket Buffer"
 #define REDIS_SOCK_STATUS_FAILED 0
 #define REDIS_SOCK_STATUS_DISCONNECTED 1
diff --git a/library.c b/library.c
@@ -550,16 +550,16 @@ PHPAPI void redis_long_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_s
     }
 
     if(response[0] == ':') {
-        long ret = atol(response + 1);
+        long long ret = atoll(response + 1);
         IF_MULTI_OR_PIPELINE() {
-			if(ret > (long)LONG_MAX) { /* overflow */
+			if(ret > LONG_MAX) { /* overflow */
 				add_next_index_stringl(z_tab, response+1, response_len-1, 1);
 			} else {
 				efree(response);
 				add_next_index_long(z_tab, (long)ret);
 			}
         } else {
-			if(ret > (long)LONG_MAX) { /* overflow */
+			if(ret > LONG_MAX) { /* overflow */
 				RETURN_STRINGL(response+1, response_len-1, 1);
 			} else {
 				efree(response);
diff --git a/redis.c b/redis.c
@@ -3283,17 +3283,10 @@ PHPAPI void generic_ttl(INTERNAL_FUNCTION_PARAMETERS, char *keyword) {
 	if(key_free) efree(key);
 
 	REDIS_PROCESS_REQUEST(redis_sock, cmd, cmd_len);
-#ifdef PHP64
 	IF_ATOMIC() {
 	  redis_long_response(INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock, NULL, NULL);
 	}
 	REDIS_PROCESS_RESPONSE(redis_long_response);
-#else
-	IF_ATOMIC() {
-	  redis_bulk_double_response(INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock, NULL, NULL);
-	}
-	REDIS_PROCESS_RESPONSE(redis_bulk_double_response);
-#endif
 }
 
 /* {{{ proto long Redis::ttl(string key)
