Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit f8de702

Browse files
yatsukhnenkoyatsukhnenko
committed
Remove arginfo duplicates
1 parent 4ef3acd commit f8de702

1 file changed

Lines changed: 13 additions & 43 deletions

File tree

‎redis.c‎

Lines changed: 13 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -329,16 +329,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_zadd, 0, 0, 3)
329329
ZEND_ARG_INFO(0, value)
330330
ZEND_END_ARG_INFO()
331331

332-
ZEND_BEGIN_ARG_INFO_EX(arginfo_zrem, 0, 0, 2)
333-
ZEND_ARG_INFO(0, key)
334-
ZEND_ARG_INFO(0, member)
335-
#if PHP_VERSION_ID >= 50600
336-
ZEND_ARG_VARIADIC_INFO(0, other_members)
337-
#else
338-
ZEND_ARG_INFO(0, ...)
339-
#endif
340-
ZEND_END_ARG_INFO()
341-
342332
ZEND_BEGIN_ARG_INFO_EX(arginfo_zrange, 0, 0, 3)
343333
ZEND_ARG_INFO(0, key)
344334
ZEND_ARG_INFO(0, start)
@@ -372,13 +362,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_key_member, 0, 0, 2)
372362
ZEND_ARG_INFO(0, member)
373363
ZEND_END_ARG_INFO()
374364

375-
ZEND_BEGIN_ARG_INFO_EX(arginfo_key_member_value, 0, 0, 3)
376-
ZEND_ARG_INFO(0, key)
377-
ZEND_ARG_INFO(0, member)
378-
ZEND_ARG_INFO(0, value)
379-
ZEND_END_ARG_INFO()
380-
381-
ZEND_BEGIN_ARG_INFO_EX(arginfo_hdel, 0, 0, 2)
365+
ZEND_BEGIN_ARG_INFO_EX(arginfo_key_members, 0, 0, 2)
382366
ZEND_ARG_INFO(0, key)
383367
ZEND_ARG_INFO(0, member)
384368
#if PHP_VERSION_ID >= 50600
@@ -388,6 +372,12 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_hdel, 0, 0, 2)
388372
#endif
389373
ZEND_END_ARG_INFO()
390374

375+
ZEND_BEGIN_ARG_INFO_EX(arginfo_key_member_value, 0, 0, 3)
376+
ZEND_ARG_INFO(0, key)
377+
ZEND_ARG_INFO(0, member)
378+
ZEND_ARG_INFO(0, value)
379+
ZEND_END_ARG_INFO()
380+
391381
ZEND_BEGIN_ARG_INFO_EX(arginfo_hmget, 0, 0, 2)
392382
ZEND_ARG_INFO(0, key)
393383
ZEND_ARG_ARRAY_INFO(0, keys, 0)
@@ -563,26 +553,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_geoadd, 0, 0, 4)
563553
#endif
564554
ZEND_END_ARG_INFO()
565555

566-
ZEND_BEGIN_ARG_INFO_EX(arginfo_geohash, 0, 0, 2)
567-
ZEND_ARG_INFO(0, key)
568-
ZEND_ARG_INFO(0, member)
569-
#if PHP_VERSION_ID >= 50600
570-
ZEND_ARG_VARIADIC_INFO(0, other_members)
571-
#else
572-
ZEND_ARG_INFO(0, ...)
573-
#endif
574-
ZEND_END_ARG_INFO()
575-
576-
ZEND_BEGIN_ARG_INFO_EX(arginfo_geopos, 0, 0, 2)
577-
ZEND_ARG_INFO(0, key)
578-
ZEND_ARG_INFO(0, member)
579-
#if PHP_VERSION_ID >= 50600
580-
ZEND_ARG_VARIADIC_INFO(0, other_members)
581-
#else
582-
ZEND_ARG_INFO(0, ...)
583-
#endif
584-
ZEND_END_ARG_INFO()
585-
586556
ZEND_BEGIN_ARG_INFO_EX(arginfo_geodist, 0, 0, 3)
587557
ZEND_ARG_INFO(0, key)
588558
ZEND_ARG_INFO(0, src)
@@ -725,7 +695,7 @@ static zend_function_entry redis_functions[] = {
725695
PHP_ME(Redis, rpoplpush, arginfo_rpoplpush, ZEND_ACC_PUBLIC)
726696
PHP_ME(Redis, brpoplpush, arginfo_brpoplpush, ZEND_ACC_PUBLIC)
727697
PHP_ME(Redis, zAdd, arginfo_zadd, ZEND_ACC_PUBLIC)
728-
PHP_ME(Redis, zDelete, arginfo_zrem, ZEND_ACC_PUBLIC)
698+
PHP_ME(Redis, zDelete, arginfo_key_members, ZEND_ACC_PUBLIC)
729699
PHP_ME(Redis, zRange, arginfo_zrange, ZEND_ACC_PUBLIC)
730700
PHP_ME(Redis, zRevRange, arginfo_zrange, ZEND_ACC_PUBLIC)
731701
PHP_ME(Redis, zRangeByScore, arginfo_zrangebyscore, ZEND_ACC_PUBLIC)
@@ -752,7 +722,7 @@ static zend_function_entry redis_functions[] = {
752722
PHP_ME(Redis, hGet, arginfo_key_member, ZEND_ACC_PUBLIC)
753723
PHP_ME(Redis, hSet, arginfo_key_member_value, ZEND_ACC_PUBLIC)
754724
PHP_ME(Redis, hSetNx, arginfo_key_member_value, ZEND_ACC_PUBLIC)
755-
PHP_ME(Redis, hDel, arginfo_hdel, ZEND_ACC_PUBLIC)
725+
PHP_ME(Redis, hDel, arginfo_key_members, ZEND_ACC_PUBLIC)
756726
PHP_ME(Redis, hLen, arginfo_key, ZEND_ACC_PUBLIC)
757727
PHP_ME(Redis, hKeys, arginfo_key, ZEND_ACC_PUBLIC)
758728
PHP_ME(Redis, hVals, arginfo_key, ZEND_ACC_PUBLIC)
@@ -824,8 +794,8 @@ static zend_function_entry redis_functions[] = {
824794

825795
/* geoadd and friends */
826796
PHP_ME(Redis, geoadd, arginfo_geoadd, ZEND_ACC_PUBLIC)
827-
PHP_ME(Redis, geohash, arginfo_geohash, ZEND_ACC_PUBLIC)
828-
PHP_ME(Redis, geopos, arginfo_geopos, ZEND_ACC_PUBLIC)
797+
PHP_ME(Redis, geohash, arginfo_key_members, ZEND_ACC_PUBLIC)
798+
PHP_ME(Redis, geopos, arginfo_key_members, ZEND_ACC_PUBLIC)
829799
PHP_ME(Redis, geodist, arginfo_geodist, ZEND_ACC_PUBLIC)
830800
PHP_ME(Redis, georadius, arginfo_georadius, ZEND_ACC_PUBLIC)
831801
PHP_ME(Redis, georadiusbymember, arginfo_georadiusbymember, ZEND_ACC_PUBLIC)
@@ -854,8 +824,8 @@ static zend_function_entry redis_functions[] = {
854824
PHP_MALIAS(Redis, zunionstore, zUnion, arginfo_zstore, ZEND_ACC_PUBLIC)
855825
PHP_MALIAS(Redis, zinterstore, zInter, arginfo_zstore, ZEND_ACC_PUBLIC)
856826

857-
PHP_MALIAS(Redis, zRemove, zDelete, arginfo_zrem, ZEND_ACC_PUBLIC)
858-
PHP_MALIAS(Redis, zRem, zDelete, arginfo_zrem, ZEND_ACC_PUBLIC)
827+
PHP_MALIAS(Redis, zRemove, zDelete, arginfo_key_members, ZEND_ACC_PUBLIC)
828+
PHP_MALIAS(Redis, zRem, zDelete, arginfo_key_members, ZEND_ACC_PUBLIC)
859829
PHP_MALIAS(Redis, zRemoveRangeByScore, zDeleteRangeByScore, arginfo_key_min_max, ZEND_ACC_PUBLIC)
860830
PHP_MALIAS(Redis, zRemRangeByScore, zDeleteRangeByScore, arginfo_key_min_max, ZEND_ACC_PUBLIC)
861831
PHP_MALIAS(Redis, zRemRangeByRank, zDeleteRangeByRank, arginfo_key_min_max, ZEND_ACC_PUBLIC)

0 commit comments

Comments
 (0)