refactoring (phpredis#1140)

* refactoring

* Fix read_timeout

Author: yatsukhnenko

library.c

@@ -1597,7 +1597,7 @@ PHP_REDIS_API int redis_sock_connect(RedisSock *redis_sock TSRMLS_DC)
 
     php_stream_auto_cleanup(redis_sock->stream);
 
-    if(tv.tv_sec != 0 || tv.tv_usec != 0) {
+    if (read_tv.tv_sec != 0 || read_tv.tv_usec != 0) {
         php_stream_set_option(redis_sock->stream,PHP_STREAM_OPTION_READ_TIMEOUT,
             0, &read_tv);
     }
@@ -1791,36 +1791,33 @@ redis_mbulk_reply_loop(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
                        zval *z_tab, int count, int unserialize)
 {
     char *line;
-    int len;
-
-    while(count > 0) {
-        line = redis_sock_read(redis_sock, &len TSRMLS_CC);
-        if (line != NULL) {
-            zval zv, *z = &zv;
-            int unwrap;
-
-            /* We will attempt unserialization, if we're unserializing everything,
-             * or if we're unserializing keys and we're on a key, or we're
-             * unserializing values and we're on a value! */
-            unwrap = unserialize == UNSERIALIZE_ALL ||
-                (unserialize == UNSERIALIZE_KEYS && count % 2 == 0) ||
-                (unserialize == UNSERIALIZE_VALS && count % 2 != 0);
-
-            if (unwrap && redis_unserialize(redis_sock, line, len, z TSRMLS_CC)) {
+    int i, len;
+
+    for (i = 0; i < count; ++i) {
+        if ((line = redis_sock_read(redis_sock, &len TSRMLS_CC)) == NULL) {
+            add_next_index_bool(z_tab, 0);
+            continue;
+        }
+
+        /* We will attempt unserialization, if we're unserializing everything,
+         * or if we're unserializing keys and we're on a key, or we're
+         * unserializing values and we're on a value! */
+        int unwrap = (
+            (unserialize == UNSERIALIZE_ALL) ||
+            (unserialize == UNSERIALIZE_KEYS && i % 2 == 0) ||
+            (unserialize == UNSERIALIZE_VALS && i % 2 != 0)
+        );
+        zval zv, *z = &zv;
+        if (unwrap && redis_unserialize(redis_sock, line, len, z TSRMLS_CC)) {
 #if (PHP_MAJOR_VERSION < 7)
-                MAKE_STD_ZVAL(z);
-                *z = zv;
+            MAKE_STD_ZVAL(z);
+            *z = zv;
 #endif
-                add_next_index_zval(z_tab, z);
-            } else {
-                add_next_index_stringl(z_tab, line, len);
-            }
-            efree(line);
+            add_next_index_zval(z_tab, z);
         } else {
-            add_next_index_bool(z_tab, 0);
+            add_next_index_stringl(z_tab, line, len);
         }
-
-        count--;
+        efree(line);
     }
 }
 

redis.c

@@ -788,6 +788,7 @@ PHP_METHOD(Redis, pconnect)
     if (redis_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1) == FAILURE) {
         RETURN_FALSE;
     } else {
+        /* FIXME: should we remove whole `else` block? */
         /* reset multi/exec state if there is one. */
         RedisSock *redis_sock;
         if ((redis_sock = redis_sock_get(getThis() TSRMLS_CC, 0)) == NULL) {

redis_commands.c

@@ -3138,7 +3138,6 @@ void redis_setoption_handler(INTERNAL_FUNCTION_PARAMETERS,
     char *val_str;
     struct timeval read_tv;
     strlen_t val_len;
-    int test_val;
 
     if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ls", &option,
                               &val_str, &val_len) == FAILURE)
@@ -3149,18 +3148,15 @@ void redis_setoption_handler(INTERNAL_FUNCTION_PARAMETERS,
     switch(option) {
         case REDIS_OPT_SERIALIZER:
             val_long = atol(val_str);
-            test_val = val_long == REDIS_SERIALIZER_NONE || val_long == REDIS_SERIALIZER_PHP;
+            if (val_long == REDIS_SERIALIZER_NONE || val_long == REDIS_SERIALIZER_PHP
 #ifdef HAVE_REDIS_IGBINARY
-            test_val = test_val || val_long == REDIS_SERIALIZER_IGBINARY;
+                || val_long == REDIS_SERIALIZER_IGBINARY
 #endif
-                if(test_val)
-                {
-                    redis_sock->serializer = val_long;
-                    RETURN_TRUE;
-                } else {
-                    RETURN_FALSE;
-                }
-                break;
+            ) {
+                redis_sock->serializer = val_long;
+                RETURN_TRUE;
+            }
+            break;
         case REDIS_OPT_PREFIX:
             if(redis_sock->prefix) {
                 efree(redis_sock->prefix);
@@ -3190,7 +3186,6 @@ void redis_setoption_handler(INTERNAL_FUNCTION_PARAMETERS,
                 redis_sock->scan = val_long;
                 RETURN_TRUE;
             }
-            RETURN_FALSE;
             break;
         case REDIS_OPT_FAILOVER:
             val_long = atol(val_str);
@@ -3201,12 +3196,11 @@ void redis_setoption_handler(INTERNAL_FUNCTION_PARAMETERS,
             {
                 c->failover = val_long;
                 RETURN_TRUE;
-            } else {
-                RETURN_FALSE;
             }
-        default:
-            RETURN_FALSE;
+            break;
+        EMPTY_SWITCH_DEFAULT_CASE()
     }
+    RETURN_FALSE;
 }
 
 void redis_prefix_handler(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock) {