Remove redis_send_discard duplication

yatsukhnenko · yatsukhnenko · commit ea15ce24cd45 · 2017-07-13T00:13:19.000+03:00
diff --git a/library.c b/library.c
@@ -1527,28 +1527,6 @@ PHP_REDIS_API int redis_sock_disconnect(RedisSock *redis_sock TSRMLS_DC)
     return 0;
 }
 
-PHP_REDIS_API void redis_send_discard(INTERNAL_FUNCTION_PARAMETERS,
-                               RedisSock *redis_sock)
-{
-    char *cmd;
-    int response_len, cmd_len;
-    char * response;
-
-    cmd_len = redis_spprintf(redis_sock, NULL TSRMLS_CC, &cmd, "DISCARD", "");
-
-    SOCKET_WRITE_COMMAND(redis_sock, cmd, cmd_len)
-    efree(cmd);
-
-    if ((response = redis_sock_read(redis_sock, &response_len TSRMLS_CC))
-                                    == NULL)
-    {
-        RETURN_FALSE;
-    }
-
-    RETVAL_BOOL(response_len == 3 && strncmp(response, "+OK", 3) == 0);
-    efree(response);
-}
-
 /**
  * redis_sock_set_err
  */
diff --git a/library.h b/library.h
@@ -66,7 +66,6 @@ PHP_REDIS_API void redis_stream_close(RedisSock *redis_sock TSRMLS_DC);
 PHP_REDIS_API int redis_check_eof(RedisSock *redis_sock, int no_throw TSRMLS_DC);
 PHP_REDIS_API RedisSock *redis_sock_get(zval *id TSRMLS_DC, int nothrow);
 PHP_REDIS_API void redis_free_socket(RedisSock *redis_sock);
-PHP_REDIS_API void redis_send_discard(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock);
 PHP_REDIS_API void redis_sock_set_err(RedisSock *redis_sock, const char *msg, int msg_len);
 
 PHP_REDIS_API int
diff --git a/redis.c b/redis.c
@@ -906,7 +906,9 @@ PHP_REDIS_API zend_class_entry *redis_get_exception_base(int root TSRMLS_DC)
 }
 
 /* Send a static DISCARD in case we're in MULTI mode. */
-static int send_discard_static(RedisSock *redis_sock TSRMLS_DC) {
+static int
+redis_send_discard(RedisSock *redis_sock TSRMLS_DC)
+{
     int result = FAILURE;
     char *cmd, *resp;
     int resp_len, cmd_len;
@@ -1255,7 +1257,7 @@ PHP_METHOD(Redis,__destruct) {
     IF_MULTI() {
         // Discard any multi commands, and free any callbacks that have been
         // queued
-        send_discard_static(redis_sock TSRMLS_CC);
+        redis_send_discard(redis_sock TSRMLS_CC);
         free_reply_callbacks(redis_sock);
     }
 }
@@ -2673,7 +2675,7 @@ PHP_METHOD(Redis, discard)
 
     redis_sock->mode = ATOMIC;
     free_reply_callbacks(redis_sock);
-    redis_send_discard(INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock);
+    RETURN_BOOL(redis_send_discard(redis_sock TSRMLS_CC) == SUCCESS);
 }
 
 /* redis_sock_read_multibulk_multi_reply */

Original file line number	Diff line number	Diff line change
`@@ -906,7 +906,9 @@ PHP_REDIS_API zend_class_entry *redis_get_exception_base(int root TSRMLS_DC)`
`906`	`906`	`}`
`907`	`907`
`908`	`908`	`/* Send a static DISCARD in case we're in MULTI mode. */`
`909`		`-static int send_discard_static(RedisSock *redis_sock TSRMLS_DC) {`
	`909`	`+static int`
	`910`	`+redis_send_discard(RedisSock *redis_sock TSRMLS_DC)`
	`911`	`+{`
`910`	`912`	`int result = FAILURE;`
`911`	`913`	`char cmd, resp;`
`912`	`914`	`int resp_len, cmd_len;`
`@@ -1255,7 +1257,7 @@ PHP_METHOD(Redis,__destruct) {`
`1255`	`1257`	`IF_MULTI() {`
`1256`	`1258`	`// Discard any multi commands, and free any callbacks that have been`
`1257`	`1259`	`// queued`
`1258`		`- send_discard_static(redis_sock TSRMLS_CC);`
	`1260`	`+ redis_send_discard(redis_sock TSRMLS_CC);`
`1259`	`1261`	`free_reply_callbacks(redis_sock);`
`1260`	`1262`	`}`
`1261`	`1263`	`}`
`@@ -2673,7 +2675,7 @@ PHP_METHOD(Redis, discard)`
`2673`	`2675`
`2674`	`2676`	`redis_sock->mode = ATOMIC;`
`2675`	`2677`	`free_reply_callbacks(redis_sock);`
`2676`		`- redis_send_discard(INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock);`
	`2678`	`+ RETURN_BOOL(redis_send_discard(redis_sock TSRMLS_CC) == SUCCESS);`
`2677`	`2679`	`}`
`2678`	`2680`
`2679`	`2681`	`/* redis_sock_read_multibulk_multi_reply */`