More arginfo for RedisCluster + remove duplicates

Author: yatsukhnenko

common.h

@@ -681,4 +681,21 @@ typedef struct {
 } redis_object;
 #endif
 
+/** Argument info for any function expecting 0 args */
+ZEND_BEGIN_ARG_INFO_EX(arginfo_void, 0, 0, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_key, 0, 0, 1)
+    ZEND_ARG_INFO(0, key)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_value, 0, 0, 1)
+    ZEND_ARG_INFO(0, value)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_key_value, 0, 0, 2)
+    ZEND_ARG_INFO(0, key)
+    ZEND_ARG_INFO(0, value)
+ZEND_END_ARG_INFO()
+
 #endif

redis.c

@@ -68,10 +68,6 @@ PHP_INI_BEGIN()
     PHP_INI_ENTRY("redis.clusters.read_timeout", "", PHP_INI_ALL, NULL)
 PHP_INI_END()
 
-/** Argument info for any function expecting 0 args */
-ZEND_BEGIN_ARG_INFO_EX(arginfo_void, 0, 0, 0)
-ZEND_END_ARG_INFO()
-
 /** {{{ Argument info for commands in redis 1.0 */
 ZEND_BEGIN_ARG_INFO_EX(arginfo_connect, 0, 0, 2)
     ZEND_ARG_INFO(0, host)
@@ -90,14 +86,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_echo, 0, 0, 1)
     ZEND_ARG_INFO(0, msg)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_key, 0, 0, 1)
-    ZEND_ARG_INFO(0, key)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_value, 0, 0, 1)
-    ZEND_ARG_INFO(0, value)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_set, 0, 0, 2)
     ZEND_ARG_INFO(0, key)
     ZEND_ARG_INFO(0, value)
@@ -111,11 +99,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_key_expire_value, 0, 0, 3)
     ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_key_value, 0, 0, 2)
-    ZEND_ARG_INFO(0, key)
-    ZEND_ARG_INFO(0, value)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_key_newkey, 0, 0, 2)
     ZEND_ARG_INFO(0, key)
     ZEND_ARG_INFO(0, newkey)

redis_array.c

@@ -41,9 +41,6 @@
 extern zend_class_entry *redis_ce;
 zend_class_entry *redis_array_ce;
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_void, 0, 0, 0)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ctor, 0, 0, 1)
     ZEND_ARG_INFO(0, name_or_hosts)
     ZEND_ARG_ARRAY_INFO(0, options, 0)

redis_cluster.c

@@ -40,18 +40,6 @@ zend_class_entry *redis_cluster_exception_ce;
 /* Handlers for RedisCluster */
 zend_object_handlers RedisCluster_handlers;
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_void, 0, 0, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_key, 0, 0, 1)
-    ZEND_ARG_INFO(0, key)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_key_value, 0, 0, 2)
-    ZEND_ARG_INFO(0, key)
-    ZEND_ARG_INFO(0, value)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ctor, 0, 0, 1)
     ZEND_ARG_INFO(0, name)
     ZEND_ARG_ARRAY_INFO(0, seeds, 0)
@@ -208,11 +196,11 @@ zend_function_entry redis_cluster_functions[] = {
     PHP_ME(RedisCluster, getoption, NULL, ZEND_ACC_PUBLIC)
     PHP_ME(RedisCluster, setoption, NULL, ZEND_ACC_PUBLIC)
 
-    PHP_ME(RedisCluster, _prefix, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, _serialize, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, _unserialize, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, _masters, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, _redir, NULL, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, _prefix, arginfo_key, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, _serialize, arginfo_value, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, _unserialize, arginfo_value, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, _masters, arginfo_void, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, _redir, arginfo_void, ZEND_ACC_PUBLIC)
 
     PHP_ME(RedisCluster, multi, arginfo_void, ZEND_ACC_PUBLIC)
     PHP_ME(RedisCluster, exec, arginfo_void, ZEND_ACC_PUBLIC)