Skip to content

Commit d6756ca

Browse files
committed
Remove redis_sock_read_multibulk_pipeline_reply function
1 parent 542fc30 commit d6756ca

File tree

1 file changed

+6
-22
lines changed

1 file changed

+6
-22
lines changed

redis.c

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2314,22 +2314,6 @@ PHP_METHOD(Redis, discard)
23142314
redis_send_discard(INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock);
23152315
}
23162316

2317-
PHP_REDIS_API int
2318-
redis_sock_read_multibulk_pipeline_reply(INTERNAL_FUNCTION_PARAMETERS,
2319-
RedisSock *redis_sock)
2320-
{
2321-
array_init(return_value);
2322-
2323-
redis_sock_read_multibulk_multi_reply_loop(INTERNAL_FUNCTION_PARAM_PASSTHRU,
2324-
redis_sock, return_value, 0);
2325-
2326-
/* free allocated function/request memory */
2327-
free_reply_callbacks(redis_sock);
2328-
2329-
return 0;
2330-
2331-
}
2332-
23332317
/* redis_sock_read_multibulk_multi_reply */
23342318
PHP_REDIS_API int redis_sock_read_multibulk_multi_reply(INTERNAL_FUNCTION_PARAMETERS,
23352319
RedisSock *redis_sock)
@@ -2378,8 +2362,7 @@ PHP_METHOD(Redis, exec)
23782362

23792363
IF_MULTI() {
23802364
cmd_len = redis_cmd_format_static(&cmd, "EXEC", "");
2381-
2382-
SOCKET_WRITE_COMMAND(redis_sock, cmd, cmd_len)
2365+
SOCKET_WRITE_COMMAND(redis_sock, cmd, cmd_len)
23832366
efree(cmd);
23842367

23852368
if(redis_sock_read_multibulk_multi_reply(
@@ -2414,11 +2397,12 @@ PHP_METHOD(Redis, exec)
24142397
offset += ri->request_size;
24152398
}
24162399
request[total] = '\0';
2417-
if (redis_sock_write(redis_sock, request, total TSRMLS_CC) < 0 ||
2418-
redis_sock_read_multibulk_pipeline_reply(
2419-
INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock) < 0
2420-
) {
2400+
if (redis_sock_write(redis_sock, request, total TSRMLS_CC) < 0) {
24212401
ZVAL_FALSE(return_value);
2402+
} else {
2403+
array_init(return_value);
2404+
redis_sock_read_multibulk_multi_reply_loop(
2405+
INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock, return_value, 0);
24222406
}
24232407
efree(request);
24242408
} else {

0 commit comments

Comments
 (0)