Skip to content

Commit f34ea53

Browse files
committed
Minors
1 parent 3ab1bb6 commit f34ea53

File tree

1 file changed

+31
-23
lines changed

1 file changed

+31
-23
lines changed

Diff for: php_memcached.c

+31-23
Original file line numberDiff line numberDiff line change
@@ -1190,7 +1190,7 @@ static PHP_METHOD(Memcached, __construct)
11901190

11911191
zend_bool is_persistent = 0;
11921192

1193-
/* |S!f!S */
1193+
/* "|S!f!S" */
11941194
ZEND_PARSE_PARAMETERS_START(0, 3)
11951195
Z_PARAM_OPTIONAL
11961196
Z_PARAM_STR_EX(persistent_id, 1, 0)
@@ -1423,7 +1423,7 @@ void php_memc_get_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_key)
14231423
MEMC_METHOD_INIT_VARS;
14241424

14251425
if (by_key) {
1426-
/* SS|f!l */
1426+
/* "SS|f!l" */
14271427
ZEND_PARSE_PARAMETERS_START(2, 4)
14281428
Z_PARAM_STR(server_key)
14291429
Z_PARAM_STR(key)
@@ -1432,7 +1432,7 @@ void php_memc_get_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_key)
14321432
Z_PARAM_LONG(get_flags)
14331433
ZEND_PARSE_PARAMETERS_END();
14341434
} else {
1435-
/* S|f!l */
1435+
/* "S|f!l" */
14361436
ZEND_PARSE_PARAMETERS_START(1, 3)
14371437
Z_PARAM_STR(key)
14381438
Z_PARAM_OPTIONAL
@@ -1524,13 +1524,15 @@ static void php_memc_getMulti_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_ke
15241524
zend_bool retval, preserve_order;
15251525

15261526
if (by_key) {
1527+
/* "Sa|l" */
15271528
ZEND_PARSE_PARAMETERS_START(2, 3)
15281529
Z_PARAM_STR(server_key)
15291530
Z_PARAM_ARRAY(keys)
15301531
Z_PARAM_OPTIONAL
15311532
Z_PARAM_LONG(flags)
15321533
ZEND_PARSE_PARAMETERS_END();
15331534
} else {
1535+
/* "a|l" */
15341536
ZEND_PARSE_PARAMETERS_START(1, 2)
15351537
Z_PARAM_ARRAY(keys)
15361538
Z_PARAM_OPTIONAL
@@ -1665,16 +1667,18 @@ static void php_memc_getDelayed_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_
16651667

16661668

16671669
if (by_key) {
1670+
/* "Sa/|bf!" */
16681671
ZEND_PARSE_PARAMETERS_START(2, 4)
16691672
Z_PARAM_STR(server_key)
1670-
Z_PARAM_ARRAY(keys)
1673+
Z_PARAM_ARRAY_EX(keys, 0, 1)
16711674
Z_PARAM_OPTIONAL
16721675
Z_PARAM_BOOL(with_cas)
16731676
Z_PARAM_FUNC_EX(fci, fcc, 1, 0)
16741677
ZEND_PARSE_PARAMETERS_END();
16751678
} else {
1679+
/* "a/|bf!" */
16761680
ZEND_PARSE_PARAMETERS_START(1, 3)
1677-
Z_PARAM_ARRAY(keys)
1681+
Z_PARAM_ARRAY_EX(keys, 0, 1)
16781682
Z_PARAM_OPTIONAL
16791683
Z_PARAM_BOOL(with_cas)
16801684
Z_PARAM_FUNC_EX(fci, fcc, 1, 0)
@@ -1832,6 +1836,7 @@ static void php_memc_setMulti_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_ke
18321836
MEMC_METHOD_INIT_VARS;
18331837

18341838
if (by_key) {
1839+
/* "Sa|ll" */
18351840
ZEND_PARSE_PARAMETERS_START(2, 4)
18361841
Z_PARAM_STR(server_key)
18371842
Z_PARAM_ARRAY(entries)
@@ -1840,6 +1845,7 @@ static void php_memc_setMulti_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_ke
18401845
Z_PARAM_LONG(ignored)
18411846
ZEND_PARSE_PARAMETERS_END();
18421847
} else {
1848+
/* "a|ll" */
18431849
ZEND_PARSE_PARAMETERS_START(1, 3)
18441850
Z_PARAM_ARRAY(entries)
18451851
Z_PARAM_OPTIONAL
@@ -2056,7 +2062,7 @@ static void php_memc_cas_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_key)
20562062
MEMC_METHOD_INIT_VARS;
20572063

20582064
if (by_key) {
2059-
/* zSSz|ll */
2065+
/* "zSSz|ll" */
20602066
ZEND_PARSE_PARAMETERS_START(4, 6)
20612067
Z_PARAM_ZVAL(zv_cas)
20622068
Z_PARAM_STR(server_key)
@@ -2067,7 +2073,7 @@ static void php_memc_cas_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_key)
20672073
Z_PARAM_LONG(ignored)
20682074
ZEND_PARSE_PARAMETERS_END();
20692075
} else {
2070-
/* zSz|ll */
2076+
/* "zSz|ll" */
20712077
ZEND_PARSE_PARAMETERS_START(3, 5)
20722078
Z_PARAM_ZVAL(zv_cas)
20732079
Z_PARAM_STR(key)
@@ -2162,15 +2168,15 @@ static void php_memc_delete_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_key)
21622168
MEMC_METHOD_INIT_VARS;
21632169

21642170
if (by_key) {
2165-
/* SS|l */
2171+
/* "SS|l" */
21662172
ZEND_PARSE_PARAMETERS_START(2, 3)
21672173
Z_PARAM_STR(server_key)
21682174
Z_PARAM_STR(key)
21692175
Z_PARAM_OPTIONAL
21702176
Z_PARAM_LONG(expiration)
21712177
ZEND_PARSE_PARAMETERS_END();
21722178
} else {
2173-
/* S|l */
2179+
/* "S|l" */
21742180
ZEND_PARSE_PARAMETERS_START(1, 2)
21752181
Z_PARAM_STR(key)
21762182
Z_PARAM_OPTIONAL
@@ -2210,15 +2216,15 @@ static void php_memc_deleteMulti_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by
22102216
MEMC_METHOD_INIT_VARS;
22112217

22122218
if (by_key) {
2213-
/* Sa/|l */
2219+
/* "Sa/|l" */
22142220
ZEND_PARSE_PARAMETERS_START(2, 3)
22152221
Z_PARAM_STR(server_key)
22162222
Z_PARAM_ARRAY_EX(entries, 0, 1)
22172223
Z_PARAM_OPTIONAL
22182224
Z_PARAM_LONG(expiration)
22192225
ZEND_PARSE_PARAMETERS_END();
22202226
} else {
2221-
/* a/|l */
2227+
/* "a/|l" */
22222228
ZEND_PARSE_PARAMETERS_START(1, 2)
22232229
Z_PARAM_ARRAY_EX(entries, 0, 1)
22242230
Z_PARAM_OPTIONAL
@@ -2271,6 +2277,7 @@ static void php_memc_incdec_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_key,
22712277
MEMC_METHOD_INIT_VARS;
22722278

22732279
if (!by_key) {
2280+
/* "S|lll" */
22742281
ZEND_PARSE_PARAMETERS_START(1, 4)
22752282
Z_PARAM_STR(key)
22762283
Z_PARAM_OPTIONAL
@@ -2279,6 +2286,7 @@ static void php_memc_incdec_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_key,
22792286
Z_PARAM_LONG(expiry)
22802287
ZEND_PARSE_PARAMETERS_END();
22812288
} else {
2289+
/* "SS|lll" */
22822290
ZEND_PARSE_PARAMETERS_START(2, 5)
22832291
Z_PARAM_STR(server_key)
22842292
Z_PARAM_STR(key)
@@ -2397,7 +2405,7 @@ PHP_METHOD(Memcached, addServer)
23972405
memcached_return status;
23982406
MEMC_METHOD_INIT_VARS;
23992407

2400-
/* Sa/|l */
2408+
/* "Sa/|l" */
24012409
ZEND_PARSE_PARAMETERS_START(2, 3)
24022410
Z_PARAM_STR(host)
24032411
Z_PARAM_LONG(port)
@@ -2431,7 +2439,7 @@ PHP_METHOD(Memcached, addServers)
24312439
memcached_return status;
24322440
MEMC_METHOD_INIT_VARS;
24332441

2434-
/* a/ */
2442+
/* "a/" */
24352443
ZEND_PARSE_PARAMETERS_START(1, 1)
24362444
Z_PARAM_ARRAY_EX(servers, 0, 1)
24372445
ZEND_PARSE_PARAMETERS_END();
@@ -2536,7 +2544,7 @@ PHP_METHOD(Memcached, getServerByKey)
25362544
memcached_return error;
25372545
MEMC_METHOD_INIT_VARS;
25382546

2539-
/* S */
2547+
/* "S" */
25402548
ZEND_PARSE_PARAMETERS_START(1, 1)
25412549
Z_PARAM_STR(server_key)
25422550
ZEND_PARSE_PARAMETERS_END();
@@ -2757,7 +2765,7 @@ PHP_METHOD(Memcached, getStats)
27572765
zend_string *args_string = NULL;
27582766
MEMC_METHOD_INIT_VARS;
27592767

2760-
/* |S! */
2768+
/* "|S!" */
27612769
ZEND_PARSE_PARAMETERS_START(0, 1)
27622770
Z_PARAM_OPTIONAL
27632771
Z_PARAM_STR_EX(args_string, 1, 0)
@@ -2849,7 +2857,7 @@ static PHP_METHOD(Memcached, flush)
28492857
memcached_return status;
28502858
MEMC_METHOD_INIT_VARS;
28512859

2852-
/* |l */
2860+
/* "|l" */
28532861
ZEND_PARSE_PARAMETERS_START(0, 1)
28542862
Z_PARAM_OPTIONAL
28552863
Z_PARAM_LONG(delay)
@@ -2876,7 +2884,7 @@ static PHP_METHOD(Memcached, getOption)
28762884
memcached_behavior flag;
28772885
MEMC_METHOD_INIT_VARS;
28782886

2879-
/* l */
2887+
/* "l" */
28802888
ZEND_PARSE_PARAMETERS_START(1, 1)
28812889
Z_PARAM_LONG(option)
28822890
ZEND_PARSE_PARAMETERS_END();
@@ -3129,7 +3137,7 @@ PHP_METHOD(Memcached, setBucket)
31293137
memcached_return rc;
31303138
MEMC_METHOD_INIT_VARS;
31313139

3132-
/* aa!l */
3140+
/* "aa!l" */
31333141
ZEND_PARSE_PARAMETERS_START(3, 3)
31343142
Z_PARAM_ARRAY(zserver_map)
31353143
Z_PARAM_ARRAY_EX(zforward_map, 1, 0)
@@ -3195,7 +3203,7 @@ static PHP_METHOD(Memcached, setOptions)
31953203

31963204
MEMC_METHOD_INIT_VARS;
31973205

3198-
/* a */
3206+
/* "a" */
31993207
ZEND_PARSE_PARAMETERS_START(1, 1)
32003208
Z_PARAM_ARRAY(options)
32013209
ZEND_PARSE_PARAMETERS_END();
@@ -3226,7 +3234,7 @@ static PHP_METHOD(Memcached, setOption)
32263234
zval *value;
32273235
MEMC_METHOD_INIT_VARS;
32283236

3229-
/* lz/ */
3237+
/* "lz/" */
32303238
ZEND_PARSE_PARAMETERS_START(2, 2)
32313239
Z_PARAM_LONG(option)
32323240
Z_PARAM_ZVAL_EX(value, 0, 1)
@@ -3247,7 +3255,7 @@ static PHP_METHOD(Memcached, setSaslAuthData)
32473255
memcached_return status;
32483256
zend_string *user, *pass;
32493257

3250-
/* SS/ */
3258+
/* "SS/" */
32513259
ZEND_PARSE_PARAMETERS_START(2, 2)
32523260
Z_PARAM_STR(user)
32533261
Z_PARAM_STR(pass)
@@ -3733,7 +3741,7 @@ PHP_METHOD(MemcachedServer, run)
37333741
php_memc_server_t *intern;
37343742
intern = Z_MEMC_SERVER_P(getThis());
37353743

3736-
/* S */
3744+
/* "S" */
37373745
ZEND_PARSE_PARAMETERS_START(1, 1)
37383746
Z_PARAM_STR(address)
37393747
ZEND_PARSE_PARAMETERS_END();
@@ -3755,7 +3763,7 @@ PHP_METHOD(MemcachedServer, on)
37553763
zend_fcall_info_cache fci_cache;
37563764
zend_bool rc = 0;
37573765

3758-
/* lf! */
3766+
/* "lf!" */
37593767
ZEND_PARSE_PARAMETERS_START(2, 2)
37603768
Z_PARAM_LONG(event)
37613769
Z_PARAM_FUNC_EX(fci, fci_cache, 1, 0)

0 commit comments

Comments
 (0)