mirror/phpredis
1
0
Fork 0
mirror of https://github.com/phpredis/phpredis.git synced 2026-06-19 07:35:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused macros + simplify some logic

Browse Source
This commit is contained in:
michael-grunder
2025-07-16 21:55:48 -07:00
committed by Michael Grunder
parent ce5b0facc2
commit 75acbb0984
2 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common.h
-6
View File
@@ -264,12 +264,6 @@ static inline int redis_strncmp(const char *s1, const char *s2, size_t n) {
#define ZSTR_STRICMP_STATIC(zs, sstr) \
REDIS_STRICMP_STATIC(ZSTR_VAL(zs), ZSTR_LEN(zs), sstr)
#define REDIS_ENABLE_MODE(redis_sock, m) (redis_sock->mode |= m)
#define REDIS_DISABLE_MODE(redis_sock, m) (redis_sock->mode &= ~m)
#define REDIS_ENABLE_FLAG(redis_sock, f) (redis_sock->flags |= f)
#define REDIS_DISABLE_FLAG(redis_sock, f) (redis_sock->flags &= ~f)
/* HOST_NAME_MAX doesn't exist everywhere */
#ifndef HOST_NAME_MAX
#if defined(_POSIX_HOST_NAME_MAX)
redis.c
+7 -10
View File
@@ -1983,7 +1983,7 @@ PHP_METHOD(Redis, multi)
/* Enable PIPELINE if we're not already in one */
if (IS_ATOMIC(redis_sock)) {
REDIS_ENABLE_MODE(redis_sock, PIPELINE);
redis_sock->mode |= PIPELINE;
}
} else if (multi_value == MULTI) {
/* Don't want to do anything if we're already in MULTI mode */
@@ -1991,7 +1991,7 @@ PHP_METHOD(Redis, multi)
if (IS_PIPELINE(redis_sock)) {
PIPELINE_ENQUEUE_COMMAND(RESP_MULTI_CMD, sizeof(RESP_MULTI_CMD) - 1);
REDIS_SAVE_CALLBACK(NULL, NULL);
REDIS_ENABLE_MODE(redis_sock, MULTI);
redis_sock->mode |= MULTI;
} else {
if (redis_sock_write(redis_sock, ZEND_STRL(RESP_MULTI_CMD)) < 0) {
RETURN_FALSE;
@@ -2003,7 +2003,7 @@ PHP_METHOD(Redis, multi)
RETURN_FALSE;
}
efree(resp);
REDIS_ENABLE_MODE(redis_sock, MULTI);
redis_sock->mode |= MULTI;
}
}
} else {
@@ -2091,7 +2091,7 @@ PHP_METHOD(Redis, exec)
if (IS_PIPELINE(redis_sock)) {
PIPELINE_ENQUEUE_COMMAND(RESP_EXEC_CMD, sizeof(RESP_EXEC_CMD) - 1);
REDIS_SAVE_CALLBACK(NULL, NULL);
REDIS_DISABLE_MODE(redis_sock, MULTI);
redis_sock->mode &= ~MULTI;
RETURN_ZVAL(getThis(), 1, 0);
}
if (redis_sock_write(redis_sock, ZEND_STRL(RESP_EXEC_CMD)) < 0) {
@@ -2100,7 +2100,7 @@ PHP_METHOD(Redis, exec)
ret = redis_sock_read_multibulk_multi_reply(
INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock, &z_ret);
redis_free_reply_callbacks(redis_sock);
REDIS_DISABLE_MODE(redis_sock, MULTI);
redis_sock->mode &= ~MULTI;
redis_sock->watching = 0;
if (ret < 0) {
zval_dtor(&z_ret);
@@ -2127,7 +2127,7 @@ PHP_METHOD(Redis, exec)
smart_string_free(&redis_sock->pipeline_cmd);
}
redis_free_reply_callbacks(redis_sock);
REDIS_DISABLE_MODE(redis_sock, PIPELINE);
redis_sock->mode &= ~PIPELINE;
}
RETURN_ZVAL(&z_ret, 0, 1);
}
@@ -2217,10 +2217,7 @@ PHP_METHOD(Redis, pipeline)
/* Enable pipeline mode unless we're already in that mode in which case this
* is just a NO OP */
if (IS_ATOMIC(redis_sock)) {
/* NB : we keep the function fold, to detect the last function.
* We need the response format of the n - 1 command. So, we can delete
* when n > 2, the { 1 .. n - 2} commands */
REDIS_ENABLE_MODE(redis_sock, PIPELINE);
redis_sock->mode |= PIPELINE;
}
RETURN_ZVAL(getThis(), 1, 0);