Skip to content

Commit c14d5bc

Browse files
yatsukhnenkoyatsukhnenko
committed
Rename MAKE_STD_ZVAL to PHPREDIS_STD_ZVAL to not confuse everyone
1 parent 70bbe04 commit c14d5bc

File tree

6 files changed

+53
-101
lines changed

6 files changed

+53
-101
lines changed

‎cluster_library.c

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1809,7 +1809,6 @@ PHP_REDIS_API void cluster_unsub_resp(INTERNAL_FUNCTION_PARAMETERS,
18091809
/* Recursive MULTI BULK -> PHP style response handling */
18101810
static void cluster_mbulk_variant_resp(clusterReply *r, zval *z_ret)
18111811
{
1812-
zval zv, *z_sub_ele = &zv;
18131812
int i;
18141813

18151814
switch(r->type) {
@@ -1827,16 +1826,16 @@ static void cluster_mbulk_variant_resp(clusterReply *r, zval *z_ret)
18271826
add_next_index_null(z_ret);
18281827
}
18291828
break;
1830-
case TYPE_MULTIBULK:
1831-
#if (PHP_MAJOR_VERSION < 7)
1832-
MAKE_STD_ZVAL(z_sub_ele);
1833-
#endif
1829+
case TYPE_MULTIBULK: {
1830+
zval *z_sub_ele;
1831+
PHPREDIS_STD_ZVAL(z_sub_ele);
18341832
array_init(z_sub_ele);
18351833
for(i=0;i<r->elements;i++) {
18361834
cluster_mbulk_variant_resp(r->element[i], z_sub_ele);
18371835
}
18381836
add_next_index_zval(z_ret, z_sub_ele);
18391837
break;
1838+
}
18401839
default:
18411840
add_next_index_bool(z_ret, 0);
18421841
break;
@@ -1924,17 +1923,15 @@ PHP_REDIS_API void cluster_variant_resp(INTERNAL_FUNCTION_PARAMETERS, redisClust
19241923
PHP_REDIS_API void cluster_gen_mbulk_resp(INTERNAL_FUNCTION_PARAMETERS,
19251924
redisCluster *c, mbulk_cb cb, void *ctx)
19261925
{
1927-
zval zv, *z_result = &zv;
1926+
zval *z_result;
19281927

19291928
/* Return FALSE if we didn't get a multi-bulk response */
19301929
if (c->reply_type != TYPE_MULTIBULK) {
19311930
CLUSTER_RETURN_FALSE(c);
19321931
}
19331932

19341933
/* Allocate our array */
1935-
#if (PHP_MAJOR_VERSION < 7)
1936-
MAKE_STD_ZVAL(z_result);
1937-
#endif
1934+
PHPREDIS_STD_ZVAL(z_result);
19381935
array_init(z_result);
19391936

19401937
/* Consume replies as long as there are more than zero */
@@ -2047,17 +2044,15 @@ PHP_REDIS_API void cluster_client_list_resp(INTERNAL_FUNCTION_PARAMETERS, redisC
20472044
void *ctx)
20482045
{
20492046
char *info;
2050-
zval zv, *z_result = &zv;
2047+
zval *z_result;
20512048

20522049
/* Read the bulk response */
20532050
info = redis_sock_read_bulk_reply(c->cmd_sock, c->reply_len TSRMLS_CC);
20542051
if (info == NULL) {
20552052
CLUSTER_RETURN_FALSE(c);
20562053
}
20572054

2058-
#if (PHP_MAJOR_VERSION < 7)
2059-
MAKE_STD_ZVAL(z_result);
2060-
#endif
2055+
PHPREDIS_STD_ZVAL(z_result);
20612056

20622057
/* Parse it and free the bulk string */
20632058
redis_parse_client_list_response(info, z_result);

‎common.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#if (PHP_MAJOR_VERSION < 7)
1313
#include <ext/standard/php_smart_str.h>
1414

15+
#define PHPREDIS_STD_ZVAL(zv) MAKE_STD_ZVAL(zv)
1516
/* This macro simply pases through to zval_ptr_dtor in php5, which will
1617
* destroy any allocated zval value and efree the zval itself when the
1718
* refcount reaches 0 */
@@ -385,11 +386,10 @@ typedef int strlen_t;
385386
#include <ext/standard/php_smart_string.h>
386387
typedef size_t strlen_t;
387388

388-
/* php7 mostly uses stack allocated zval variables and no longer has the
389-
* MAKE_STD_ZVAL macro. This macro creates a stack allocated alias zval
389+
/* This macro creates a stack allocated alias zval
390390
* variable and points the requested variable to it. */
391-
#define MAKE_STD_ZVAL(zv) \
392-
zval _##zv##_stack; \
391+
#define PHPREDIS_STD_ZVAL(zv) \
392+
zval _##zv##_stack = {0}; \
393393
zv = &_##zv##_stack;
394394

395395
/* Companion to the above macro which in php7 that will simply destroy

‎library.c

Lines changed: 16 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -969,10 +969,8 @@ PHP_REDIS_API void redis_client_list_reply(INTERNAL_FUNCTION_PARAMETERS, RedisSo
969969
RETURN_FALSE;
970970
}
971971

972-
zval zv, *z_ret = &zv;
973-
#if (PHP_MAJOR_VERSION < 7)
974-
MAKE_STD_ZVAL(z_ret);
975-
#endif
972+
zval *z_ret;
973+
PHPREDIS_STD_ZVAL(z_ret);
976974

977975
/* Parse it out */
978976
redis_parse_client_list_response(resp, z_ret);
@@ -1218,10 +1216,8 @@ static void array_zip_values_and_scores(RedisSock *redis_sock, zval *z_tab,
12181216
} else if (decode == SCORE_DECODE_DOUBLE) {
12191217
add_assoc_double_ex(z_ret, hkey->val, hkey->len, atof(hval));
12201218
} else {
1221-
zval zv0, *z = &zv0;
1222-
#if (PHP_MAJOR_VERSION < 7)
1223-
MAKE_STD_ZVAL(z);
1224-
#endif
1219+
zval *z;
1220+
PHPREDIS_STD_ZVAL(z);
12251221
ZVAL_ZVAL(z, z_value_p, 1, 0);
12261222
add_assoc_zval_ex(z_ret, hkey->val, hkey->len, z);
12271223
}
@@ -1255,10 +1251,8 @@ redis_mbulk_reply_zipped(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
12551251
return -1;
12561252
}
12571253
numElems = atoi(inbuf+1);
1258-
zval zv, *z_multi_result = &zv;
1259-
#if (PHP_MAJOR_VERSION < 7)
1260-
MAKE_STD_ZVAL(z_multi_result);
1261-
#endif
1254+
zval *z_multi_result;
1255+
PHPREDIS_STD_ZVAL(z_multi_result);
12621256
array_init(z_multi_result); /* pre-allocate array for multi's results. */
12631257

12641258
/* Grab our key, value, key, value array */
@@ -1402,10 +1396,8 @@ PHP_REDIS_API void redis_debug_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock
14021396
RETURN_FALSE;
14031397
}
14041398

1405-
zval zv, *z_result = &zv;
1406-
#if (PHP_MAJOR_VERSION < 7)
1407-
MAKE_STD_ZVAL(z_result);
1408-
#endif
1399+
zval *z_result;
1400+
PHPREDIS_STD_ZVAL(z_result);
14091401
array_init(z_result);
14101402

14111403
/* Skip the '+' */
@@ -1696,10 +1688,8 @@ PHP_REDIS_API int redis_sock_read_multibulk_reply(INTERNAL_FUNCTION_PARAMETERS,
16961688
return -1;
16971689
}
16981690
numElems = atoi(inbuf+1);
1699-
zval zv, *z_multi_result = &zv;
1700-
#if (PHP_MAJOR_VERSION < 7)
1701-
MAKE_STD_ZVAL(z_multi_result);
1702-
#endif
1691+
zval *z_multi_result;
1692+
PHPREDIS_STD_ZVAL(z_multi_result);
17031693
array_init(z_multi_result); /* pre-allocate array for multi's results. */
17041694

17051695
redis_mbulk_reply_loop(INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock,
@@ -1739,10 +1729,8 @@ redis_mbulk_reply_raw(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval
17391729
return -1;
17401730
}
17411731
numElems = atoi(inbuf+1);
1742-
zval zv, *z_multi_result = &zv;
1743-
#if (PHP_MAJOR_VERSION < 7)
1744-
MAKE_STD_ZVAL(z_multi_result);
1745-
#endif
1732+
zval *z_multi_result;
1733+
PHPREDIS_STD_ZVAL(z_multi_result);
17461734
array_init(z_multi_result); /* pre-allocate array for multi's results. */
17471735

17481736
redis_mbulk_reply_loop(INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock,
@@ -1816,10 +1804,8 @@ PHP_REDIS_API int redis_mbulk_reply_assoc(INTERNAL_FUNCTION_PARAMETERS, RedisSoc
18161804
return -1;
18171805
}
18181806
numElems = atoi(inbuf+1);
1819-
zval zv, *z_multi_result = &zv;
1820-
#if (PHP_MAJOR_VERSION < 7)
1821-
MAKE_STD_ZVAL(z_multi_result);
1822-
#endif
1807+
zval *z_multi_result;
1808+
PHPREDIS_STD_ZVAL(z_multi_result);
18231809
array_init(z_multi_result); /* pre-allocate array for multi's results. */
18241810

18251811
for(i = 0; i < numElems; ++i) {
@@ -2261,10 +2247,8 @@ redis_read_variant_reply(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
22612247
return -1;
22622248
}
22632249

2264-
zval zv, *z_ret = &zv;
2265-
#if (PHP_MAJOR_VERSION < 7)
2266-
MAKE_STD_ZVAL(z_ret);
2267-
#endif
2250+
zval *z_ret;
2251+
PHPREDIS_STD_ZVAL(z_ret);
22682252
/* Switch based on our top level reply type */
22692253
switch(reply_type) {
22702254
case TYPE_ERR:

‎redis_array.c

Lines changed: 21 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -604,10 +604,8 @@ static void multihost_distribute(INTERNAL_FUNCTION_PARAMETERS, const char *metho
604604

605605
array_init(return_value);
606606
for(i = 0; i < ra->count; ++i) {
607-
zval zv, *z_tmp = &zv;
608-
#if (PHP_MAJOR_VERSION < 7)
609-
MAKE_STD_ZVAL(z_tmp);
610-
#endif
607+
zval *z_tmp;
608+
PHPREDIS_STD_ZVAL(z_tmp);
611609

612610
/* Call each node in turn */
613611
call_user_function(&redis_ce->function_table, &ra->redis[i], &z_fun, z_tmp, 0, NULL);
@@ -679,11 +677,8 @@ PHP_METHOD(RedisArray, keys)
679677

680678
/* Iterate our RedisArray nodes */
681679
for(i=0; i<ra->count; ++i) {
682-
zval zv, *z_tmp = &zv;
683-
#if (PHP_MAJOR_VERSION < 7)
684-
/* Return for this node */
685-
MAKE_STD_ZVAL(z_tmp);
686-
#endif
680+
zval *z_tmp;
681+
PHPREDIS_STD_ZVAL(z_tmp);
687682

688683
/* Call KEYS on each node */
689684
call_user_function(&redis_ce->function_table, &ra->redis[i], &z_fun, z_tmp, 1, z_args);
@@ -719,10 +714,8 @@ PHP_METHOD(RedisArray, getOption)
719714

720715
array_init(return_value);
721716
for(i = 0; i < ra->count; ++i) {
722-
zval zv, *z_tmp = &zv;
723-
#if (PHP_MAJOR_VERSION < 7)
724-
MAKE_STD_ZVAL(z_tmp);
725-
#endif
717+
zval *z_tmp;
718+
PHPREDIS_STD_ZVAL(z_tmp);
726719

727720
/* Call each node in turn */
728721
call_user_function(&redis_ce->function_table, &ra->redis[i], &z_fun, z_tmp, 1, z_args);
@@ -759,10 +752,8 @@ PHP_METHOD(RedisArray, setOption)
759752

760753
array_init(return_value);
761754
for(i = 0; i < ra->count; ++i) {
762-
zval zv, *z_tmp = &zv;
763-
#if (PHP_MAJOR_VERSION < 7)
764-
MAKE_STD_ZVAL(z_tmp);
765-
#endif
755+
zval *z_tmp;
756+
PHPREDIS_STD_ZVAL(z_tmp);
766757

767758
/* Call each node in turn */
768759
call_user_function(&redis_ce->function_table, &ra->redis[i], &z_fun, z_tmp, 2, z_args);
@@ -797,10 +788,8 @@ PHP_METHOD(RedisArray, select)
797788

798789
array_init(return_value);
799790
for(i = 0; i < ra->count; ++i) {
800-
zval zv, *z_tmp = &zv;
801-
#if (PHP_MAJOR_VERSION < 7)
802-
MAKE_STD_ZVAL(z_tmp);
803-
#endif
791+
zval *z_tmp;
792+
PHPREDIS_STD_ZVAL(z_tmp);
804793

805794
/* Call each node in turn */
806795
call_user_function(&redis_ce->function_table, &ra->redis[i], &z_fun, z_tmp, 1, z_args);
@@ -927,7 +916,7 @@ PHP_METHOD(RedisArray, mget)
927916
argv[i++] = data;
928917
} ZEND_HASH_FOREACH_END();
929918

930-
MAKE_STD_ZVAL(z_tmp_array);
919+
PHPREDIS_STD_ZVAL(z_tmp_array);
931920
array_init(z_tmp_array);
932921

933922
/* calls */
@@ -936,13 +925,13 @@ PHP_METHOD(RedisArray, mget)
936925
if(!argc_each[n]) continue;
937926

938927
/* copy args for MGET call on node. */
939-
MAKE_STD_ZVAL(z_argarray);
928+
PHPREDIS_STD_ZVAL(z_argarray);
940929
array_init(z_argarray);
941930

942931
for(i = 0; i < argc; ++i) {
943932
if(pos[i] != n) continue;
944933

945-
MAKE_STD_ZVAL(z_tmp);
934+
PHPREDIS_STD_ZVAL(z_tmp);
946935
ZVAL_ZVAL(z_tmp, argv[i], 1, 0);
947936
add_next_index_zval(z_argarray, z_tmp);
948937
}
@@ -952,7 +941,7 @@ PHP_METHOD(RedisArray, mget)
952941
ZVAL_STRINGL(&z_fun, "MGET", 4);
953942

954943
/* call MGET on the node */
955-
MAKE_STD_ZVAL(z_ret);
944+
PHPREDIS_STD_ZVAL(z_ret);
956945
call_user_function(&redis_ce->function_table, &ra->redis[n], &z_fun, z_ret, 1, z_argarray);
957946
zval_dtor(&z_fun);
958947

@@ -977,7 +966,7 @@ PHP_METHOD(RedisArray, mget)
977966

978967
z_cur = zend_hash_index_find(Z_ARRVAL_P(z_ret), j++);
979968

980-
MAKE_STD_ZVAL(z_tmp);
969+
PHPREDIS_STD_ZVAL(z_tmp);
981970
ZVAL_ZVAL(z_tmp, z_cur, 1, 0);
982971
add_index_zval(z_tmp_array, i, z_tmp);
983972
}
@@ -991,7 +980,7 @@ PHP_METHOD(RedisArray, mget)
991980
for(i = 0; i < argc; ++i) {
992981
z_cur = zend_hash_index_find(Z_ARRVAL_P(z_tmp_array), i);
993982

994-
MAKE_STD_ZVAL(z_tmp);
983+
PHPREDIS_STD_ZVAL(z_tmp);
995984
ZVAL_ZVAL(z_tmp, z_cur, 1, 0);
996985
add_next_index_zval(return_value, z_tmp);
997986
}
@@ -1072,14 +1061,14 @@ PHP_METHOD(RedisArray, mset)
10721061
int found = 0;
10731062

10741063
/* Array for calling MSET */
1075-
MAKE_STD_ZVAL(z_argarray);
1064+
PHPREDIS_STD_ZVAL(z_argarray);
10761065
array_init(z_argarray);
10771066

10781067
/* copy args */
10791068
for(i = 0; i < argc; ++i) {
10801069
if(pos[i] != n) continue;
10811070

1082-
MAKE_STD_ZVAL(z_tmp);
1071+
PHPREDIS_STD_ZVAL(z_tmp);
10831072
ZVAL_ZVAL(z_tmp, argv[i], 1, 0);
10841073
add_assoc_zval_ex(z_argarray, keys[i], key_lens[i], z_tmp);
10851074
found++;
@@ -1099,7 +1088,7 @@ PHP_METHOD(RedisArray, mset)
10991088
ZVAL_STRINGL(&z_mset, "MSET", 4);
11001089

11011090
/* call */
1102-
MAKE_STD_ZVAL(z_ret);
1091+
PHPREDIS_STD_ZVAL(z_ret);
11031092
call_user_function(&redis_ce->function_table, &ra->redis[n], &z_mset, z_ret, 1, z_argarray);
11041093
zval_dtor(&z_mset);
11051094
PHPREDIS_FREE_ZVAL(z_ret);
@@ -1161,12 +1150,7 @@ PHP_METHOD(RedisArray, del)
11611150
array_init(&z_keys);
11621151
for (i = 0; i < argc; ++i) {
11631152
zval *z_arg = &z_args[i];
1164-
#if (PHP_MAJOR_VERSION < 7)
1165-
MAKE_STD_ZVAL(z_tmp);
1166-
#else
1167-
zval zv;
1168-
z_tmp = &zv;
1169-
#endif
1153+
PHPREDIS_STD_ZVAL(z_tmp);
11701154
ZVAL_ZVAL(z_tmp, z_arg, 1, 0);
11711155
/* add copy to z_keys */
11721156
add_next_index_zval(&z_keys, z_tmp);
@@ -1219,12 +1203,7 @@ PHP_METHOD(RedisArray, del)
12191203
for(i = 0; i < argc; ++i) {
12201204
if(pos[i] != n) continue;
12211205

1222-
#if (PHP_MAJOR_VERSION < 7)
1223-
MAKE_STD_ZVAL(z_tmp);
1224-
#else
1225-
zval zv;
1226-
z_tmp = &zv;
1227-
#endif
1206+
PHPREDIS_STD_ZVAL(z_tmp);
12281207
ZVAL_ZVAL(z_tmp, argv[i], 1, 0);
12291208
add_next_index_zval(&z_argarray, z_tmp);
12301209
found++;

‎redis_array_impl.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -593,12 +593,8 @@ ra_index_keys(zval *z_pairs, zval *z_redis TSRMLS_DC) {
593593

594594
/* Go through input array and add values to the key array */
595595
ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(z_pairs), idx, zkey, z_val) {
596-
zval zv, *z_new = &zv;
597-
#if (PHP_MAJOR_VERSION < 7)
598-
MAKE_STD_ZVAL(z_new);
599-
#else
600-
PHPREDIS_NOTUSED(z_val);
601-
#endif
596+
zval *z_new;
597+
PHPREDIS_STD_ZVAL(z_new);
602598

603599
if (zkey) {
604600
ZVAL_STRINGL(z_new, zkey->val, zkey->len);

‎redis_cluster.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2091,10 +2091,8 @@ PHP_METHOD(RedisCluster, _masters) {
20912091
host = node->sock->host;
20922092
port = node->sock->port;
20932093

2094-
zval z, *z_sub = &z;
2095-
#if (PHP_MAJOR_VERSION < 7)
2096-
MAKE_STD_ZVAL(z_sub);
2097-
#endif
2094+
zval *z_sub;
2095+
PHPREDIS_STD_ZVAL(z_sub);
20982096
array_init(z_sub);
20992097

21002098
add_next_index_stringl(z_sub, host, strlen(host));

0 commit comments

Comments
 (0)