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

Skip to content

Commit 78de25a

Browse files
yatsukhnenkomichael-grunder
yatsukhnenko
authored and
michael-grunder
committed
Use ZEND_STRL in redis_commands.c
1 parent e0b24be commit 78de25a

1 file changed

Lines changed: 20 additions & 20 deletions

File tree

‎redis_commands.c‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ redis_build_script_cmd(smart_string *cmd, int argc, zval *z_args)
169169
if (!strcasecmp(Z_STRVAL(z_args[0]), "kill")) {
170170
// Simple SCRIPT_KILL command
171171
REDIS_CMD_INIT_SSTR_STATIC(cmd, argc, "SCRIPT");
172-
redis_cmd_append_sstr(cmd, "KILL", sizeof("KILL") - 1);
172+
redis_cmd_append_sstr(cmd, ZEND_STRL("KILL"));
173173
} else if (!strcasecmp(Z_STRVAL(z_args[0]), "flush")) {
174174
// Simple SCRIPT FLUSH [ASYNC | SYNC]
175175
if (argc > 1 && (
@@ -180,7 +180,7 @@ redis_build_script_cmd(smart_string *cmd, int argc, zval *z_args)
180180
return NULL;
181181
}
182182
REDIS_CMD_INIT_SSTR_STATIC(cmd, argc, "SCRIPT");
183-
redis_cmd_append_sstr(cmd, "FLUSH", sizeof("FLUSH") - 1);
183+
redis_cmd_append_sstr(cmd, ZEND_STRL("FLUSH"));
184184
if (argc > 1) {
185185
redis_cmd_append_sstr(cmd, Z_STRVAL(z_args[1]), Z_STRLEN(z_args[1]));
186186
}
@@ -192,7 +192,7 @@ redis_build_script_cmd(smart_string *cmd, int argc, zval *z_args)
192192
}
193193
// Format our SCRIPT LOAD command
194194
REDIS_CMD_INIT_SSTR_STATIC(cmd, argc, "SCRIPT");
195-
redis_cmd_append_sstr(cmd, "LOAD", sizeof("LOAD") - 1);
195+
redis_cmd_append_sstr(cmd, ZEND_STRL("LOAD"));
196196
redis_cmd_append_sstr(cmd, Z_STRVAL(z_args[1]), Z_STRLEN(z_args[1]));
197197
} else if (!strcasecmp(Z_STRVAL(z_args[0]), "exists")) {
198198
// Make sure we have a second argument
@@ -201,7 +201,7 @@ redis_build_script_cmd(smart_string *cmd, int argc, zval *z_args)
201201
}
202202
/* Construct our SCRIPT EXISTS command */
203203
REDIS_CMD_INIT_SSTR_STATIC(cmd, argc, "SCRIPT");
204-
redis_cmd_append_sstr(cmd, "EXISTS", sizeof("EXISTS") - 1);
204+
redis_cmd_append_sstr(cmd, ZEND_STRL("EXISTS"));
205205

206206
for (i = 1; i < argc; ++i) {
207207
zstr = zval_get_string(&z_args[i]);
@@ -617,13 +617,13 @@ int redis_fmt_scan_cmd(char **cmd, REDIS_SCAN_TYPE type, char *key, int key_len,
617617

618618
// Append count if we've got one
619619
if (count) {
620-
redis_cmd_append_sstr(&cmdstr,"COUNT",sizeof("COUNT")-1);
620+
redis_cmd_append_sstr(&cmdstr, ZEND_STRL("COUNT"));
621621
redis_cmd_append_sstr_long(&cmdstr, count);
622622
}
623623

624624
// Append pattern if we've got one
625625
if (pat_len) {
626-
redis_cmd_append_sstr(&cmdstr,"MATCH",sizeof("MATCH")-1);
626+
redis_cmd_append_sstr(&cmdstr, ZEND_STRL("MATCH"));
627627
redis_cmd_append_sstr(&cmdstr,pat,pat_len);
628628
}
629629

@@ -1348,7 +1348,7 @@ redis_zinterunionstore_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
13481348

13491349
// Weights
13501350
if (ht_weights != NULL) {
1351-
redis_cmd_append_sstr(&cmdstr, "WEIGHTS", sizeof("WEIGHTS")-1);
1351+
redis_cmd_append_sstr(&cmdstr, ZEND_STRL("WEIGHTS"));
13521352

13531353
// Process our weights
13541354
ZEND_HASH_FOREACH_VAL(ht_weights, z_ele) {
@@ -1362,7 +1362,7 @@ redis_zinterunionstore_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
13621362

13631363
// AGGREGATE
13641364
if (agg_op_len != 0) {
1365-
redis_cmd_append_sstr(&cmdstr, "AGGREGATE", sizeof("AGGREGATE")-1);
1365+
redis_cmd_append_sstr(&cmdstr, ZEND_STRL("AGGREGATE"));
13661366
redis_cmd_append_sstr(&cmdstr, agg_op, agg_op_len);
13671367
}
13681368

@@ -2391,7 +2391,7 @@ int redis_hmget_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
23912391
ZVAL_NULL(&z_mems[valid]);
23922392

23932393
// Start command construction
2394-
redis_cmd_init_sstr(&cmdstr, valid+1, "HMGET", sizeof("HMGET")-1);
2394+
redis_cmd_init_sstr(&cmdstr, valid+1, ZEND_STRL("HMGET"));
23952395

23962396
// Prefix our key
23972397
key_free = redis_key_prefix(redis_sock, &key, &key_len);
@@ -2453,7 +2453,7 @@ int redis_hmset_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
24532453
ht_vals = Z_ARRVAL_P(z_arr);
24542454

24552455
// Initialize our HMSET command (key + 2x each array entry), add key
2456-
redis_cmd_init_sstr(&cmdstr, 1+(count*2), "HMSET", sizeof("HMSET")-1);
2456+
redis_cmd_init_sstr(&cmdstr, 1+(count*2), ZEND_STRL("HMSET"));
24572457
redis_cmd_append_sstr(&cmdstr, key, key_len);
24582458

24592459
// Start traversing our key => value array
@@ -2806,7 +2806,7 @@ int redis_bitop_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
28062806
if (slot) *slot = -1;
28072807

28082808
// Initialize command construction, add our operation argument
2809-
redis_cmd_init_sstr(&cmdstr, argc, "BITOP", sizeof("BITOP")-1);
2809+
redis_cmd_init_sstr(&cmdstr, argc, ZEND_STRL("BITOP"));
28102810
redis_cmd_append_sstr(&cmdstr, Z_STRVAL(z_args[0]), Z_STRLEN(z_args[0]));
28112811

28122812
// Now iterate over our keys argument
@@ -2967,15 +2967,15 @@ int redis_pfadd_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
29672967
char **cmd, int *cmd_len, short *slot, void **ctx)
29682968
{
29692969
return redis_gen_pf_cmd(INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock,
2970-
"PFADD", sizeof("PFADD")-1, 0, cmd, cmd_len, slot);
2970+
ZEND_STRL("PFADD"), 0, cmd, cmd_len, slot);
29712971
}
29722972

29732973
/* PFMERGE */
29742974
int redis_pfmerge_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
29752975
char **cmd, int *cmd_len, short *slot, void **ctx)
29762976
{
29772977
return redis_gen_pf_cmd(INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock,
2978-
"PFMERGE", sizeof("PFMERGE")-1, 1, cmd, cmd_len, slot);
2978+
ZEND_STRL("PFMERGE"), 1, cmd, cmd_len, slot);
29792979
}
29802980

29812981
/* PFCOUNT */
@@ -3009,7 +3009,7 @@ int redis_pfcount_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
30093009
}
30103010

30113011
/* Initialize the command with our number of arguments */
3012-
redis_cmd_init_sstr(&cmdstr, num_keys, "PFCOUNT", sizeof("PFCOUNT")-1);
3012+
redis_cmd_init_sstr(&cmdstr, num_keys, ZEND_STRL("PFCOUNT"));
30133013

30143014
/* Append our key(s) */
30153015
ZEND_HASH_FOREACH_VAL(ht_keys, z_key) {
@@ -3043,7 +3043,7 @@ int redis_pfcount_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
30433043
} ZEND_HASH_FOREACH_END();
30443044
} else {
30453045
/* Construct our whole command */
3046-
redis_cmd_init_sstr(&cmdstr, 1, "PFCOUNT", sizeof("PFCOUNT")-1);
3046+
redis_cmd_init_sstr(&cmdstr, 1, ZEND_STRL("PFCOUNT"));
30473047

30483048
/* Turn our key into a string if it's a different type */
30493049
zstr = zval_get_string(z_keys);
@@ -3764,7 +3764,7 @@ int redis_hdel_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
37643764
arg_free = redis_key_prefix(redis_sock, &arg, &arg_len);
37653765

37663766
// Start command construction
3767-
redis_cmd_init_sstr(&cmdstr, argc, "HDEL", sizeof("HDEL")-1);
3767+
redis_cmd_init_sstr(&cmdstr, argc, ZEND_STRL("HDEL"));
37683768
redis_cmd_append_sstr(&cmdstr, arg, arg_len);
37693769

37703770
// Set our slot, free key if we prefixed it
@@ -3852,7 +3852,7 @@ int redis_zadd_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
38523852
key_free = redis_key_prefix(redis_sock, &key, &key_len);
38533853

38543854
// Start command construction
3855-
redis_cmd_init_sstr(&cmdstr, argc, "ZADD", sizeof("ZADD")-1);
3855+
redis_cmd_init_sstr(&cmdstr, argc, ZEND_STRL("ZADD"));
38563856
redis_cmd_append_sstr(&cmdstr, key, key_len);
38573857

38583858
// Set our slot, free key if we prefixed it
@@ -5054,8 +5054,8 @@ int redis_command_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
50545054
HashTable *ht_arr = Z_ARRVAL_P(z_arg);
50555055
smart_string cmdstr = {0};
50565056

5057-
redis_cmd_init_sstr(&cmdstr, 1 + arr_len, "COMMAND", sizeof("COMMAND")-1);
5058-
redis_cmd_append_sstr(&cmdstr, "GETKEYS", sizeof("GETKEYS")-1);
5057+
redis_cmd_init_sstr(&cmdstr, 1 + arr_len, ZEND_STRL("COMMAND"));
5058+
redis_cmd_append_sstr(&cmdstr, ZEND_STRL("GETKEYS"));
50595059

50605060
ZEND_HASH_FOREACH_VAL(ht_arr, z_ele) {
50615061
zend_string *zstr = zval_get_string(z_ele);
@@ -5264,7 +5264,7 @@ int redis_xrange_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
52645264
redis_cmd_append_sstr(&cmdstr, end, endlen);
52655265

52665266
if (count > -1) {
5267-
redis_cmd_append_sstr(&cmdstr, "COUNT", sizeof("COUNT")-1);
5267+
redis_cmd_append_sstr(&cmdstr, ZEND_STRL("COUNT"));
52685268
redis_cmd_append_sstr_long(&cmdstr, count);
52695269
}
52705270

0 commit comments

Comments
 (0)