Remove weird macroses

yatsukhnenko · yatsukhnenko · commit 831d6118c455 · 2022-04-04T21:04:00.000+03:00
diff --git a/common.h b/common.h
@@ -210,12 +210,6 @@ typedef enum {
     REDIS_PROCESS_RESPONSE_CLOSURE(function, NULL) \
 }
 
-/* Clear redirection info */
-#define REDIS_MOVED_CLEAR(redis_sock) \
-    redis_sock->redir_slot = 0; \
-    redis_sock->redir_port = 0; \
-    redis_sock->redir_type = MOVED_NONE; \
-
 /* Process a command assuming our command where our command building
  * function is redis_<cmdname>_cmd */
 #define REDIS_PROCESS_CMD(cmdname, resp_func) \
@@ -264,21 +258,6 @@ typedef enum {
 #define ZSTR_STRICMP_STATIC(zs, sstr) \
     REDIS_STRICMP_STATIC(ZSTR_VAL(zs), ZSTR_LEN(zs), sstr)
 
-/* Extended SET argument detection */
-#define ZSTR_IS_EX_ARG(zs) ZSTR_STRICMP_STATIC(zs, "EX")
-#define ZSTR_IS_PX_ARG(zs) ZSTR_STRICMP_STATIC(zs, "PX")
-#define ZSTR_IS_NX_ARG(zs) ZSTR_STRICMP_STATIC(zs, "NX")
-#define ZSTR_IS_XX_ARG(zs) ZSTR_STRICMP_STATIC(zs, "XX")
-
-#define ZVAL_IS_NX_XX_ARG(zv) (ZVAL_STRICMP_STATIC(zv, "NX") || ZVAL_STRICMP_STATIC(zv, "XX"))
-#define ZSTR_IS_EX_PX_ARG(a) (ZSTR_IS_EX_ARG(a) || ZSTR_IS_PX_ARG(a))
-
-/* Given a string and length, validate a zRangeByLex argument.  The semantics
- * here are that the argument must start with '(' or '[' or be just the char
- * '+' or '-' */
-#define IS_LEX_ARG(s,l) \
-    (l>0 && (*s=='(' || *s=='[' || (l==1 && (*s=='+' || *s=='-'))))
-
 #define REDIS_ENABLE_MODE(redis_sock, m) (redis_sock->mode |= m)
 #define REDIS_DISABLE_MODE(redis_sock, m) (redis_sock->mode &= ~m)
 
diff --git a/redis_commands.c b/redis_commands.c
@@ -1575,7 +1575,7 @@ int redis_set_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
         ZEND_HASH_FOREACH_STR_KEY_VAL(kt, zkey, v) {
             ZVAL_DEREF(v);
             /* Detect PX or EX argument and validate timeout */
-            if (zkey && ZSTR_IS_EX_PX_ARG(zkey)) {
+            if (zkey && (ZSTR_STRICMP_STATIC(zkey, "EX") || ZSTR_STRICMP_STATIC(zkey, "PX"))) {
                 exp_set = 1;
 
                 /* Set expire type */
@@ -1592,7 +1592,7 @@ int redis_set_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
                     keep_ttl  = 1;
                 } else if (ZVAL_STRICMP_STATIC((v), "GET")) {
                     get = 1;
-                } else if (ZVAL_IS_NX_XX_ARG(v)) {
+                } else if (ZVAL_STRICMP_STATIC(v, "NX") || ZVAL_STRICMP_STATIC(v, "XX")) {
                     set_type = Z_STRVAL_P(v);
                 }
             }
@@ -2886,7 +2886,7 @@ int redis_zadd_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
         zval *z_opt;
         ZEND_HASH_FOREACH_VAL(Z_ARRVAL(z_args[1]), z_opt) {
             if (Z_TYPE_P(z_opt) == IS_STRING) {
-                if (ZVAL_IS_NX_XX_ARG(z_opt)) {
+                if (ZVAL_STRICMP_STATIC(z_opt, "NX") || ZVAL_STRICMP_STATIC(z_opt, "XX")) {
                     exp_type = Z_STRVAL_P(z_opt);
                 } else if (ZVAL_STRICMP_STATIC(z_opt, "LT") || ZVAL_STRICMP_STATIC(z_opt, "GT")) {
                     range_type = Z_STRVAL_P(z_opt);
