Skip to content

Commit cdffc9e

Browse files
sodabrewsodabrew
committed
Minors
1 parent 5f28ffe commit cdffc9e

1 file changed

Lines changed: 31 additions & 23 deletions

File tree

‎php_memcached.c‎

Lines changed: 31 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1174,7 +1174,7 @@ static PHP_METHOD(Memcached, __construct)
11741174

11751175
zend_bool is_persistent = 0;
11761176

1177-
/* |S!f!S */
1177+
/* "|S!f!S" */
11781178
ZEND_PARSE_PARAMETERS_START(0, 3)
11791179
Z_PARAM_OPTIONAL
11801180
Z_PARAM_STR_EX(persistent_id, 1, 0)
@@ -1407,7 +1407,7 @@ void php_memc_get_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_key)
14071407
MEMC_METHOD_INIT_VARS;
14081408

14091409
if (by_key) {
1410-
/* SS|f!l */
1410+
/* "SS|f!l" */
14111411
ZEND_PARSE_PARAMETERS_START(2, 4)
14121412
Z_PARAM_STR(server_key)
14131413
Z_PARAM_STR(key)
@@ -1416,7 +1416,7 @@ void php_memc_get_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_key)
14161416
Z_PARAM_LONG(get_flags)
14171417
ZEND_PARSE_PARAMETERS_END();
14181418
} else {
1419-
/* S|f!l */
1419+
/* "S|f!l" */
14201420
ZEND_PARSE_PARAMETERS_START(1, 3)
14211421
Z_PARAM_STR(key)
14221422
Z_PARAM_OPTIONAL
@@ -1508,13 +1508,15 @@ static void php_memc_getMulti_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_ke
15081508
zend_bool retval, preserve_order;
15091509

15101510
if (by_key) {
1511+
/* "Sa|l" */
15111512
ZEND_PARSE_PARAMETERS_START(2, 3)
15121513
Z_PARAM_STR(server_key)
15131514
Z_PARAM_ARRAY(keys)
15141515
Z_PARAM_OPTIONAL
15151516
Z_PARAM_LONG(flags)
15161517
ZEND_PARSE_PARAMETERS_END();
15171518
} else {
1519+
/* "a|l" */
15181520
ZEND_PARSE_PARAMETERS_START(1, 2)
15191521
Z_PARAM_ARRAY(keys)
15201522
Z_PARAM_OPTIONAL
@@ -1649,16 +1651,18 @@ static void php_memc_getDelayed_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_
16491651

16501652

16511653
if (by_key) {
1654+
/* "Sa/|bf!" */
16521655
ZEND_PARSE_PARAMETERS_START(2, 4)
16531656
Z_PARAM_STR(server_key)
1654-
Z_PARAM_ARRAY(keys)
1657+
Z_PARAM_ARRAY_EX(keys, 0, 1)
16551658
Z_PARAM_OPTIONAL
16561659
Z_PARAM_BOOL(with_cas)
16571660
Z_PARAM_FUNC_EX(fci, fcc, 1, 0)
16581661
ZEND_PARSE_PARAMETERS_END();
16591662
} else {
1663+
/* "a/|bf!" */
16601664
ZEND_PARSE_PARAMETERS_START(1, 3)
1661-
Z_PARAM_ARRAY(keys)
1665+
Z_PARAM_ARRAY_EX(keys, 0, 1)
16621666
Z_PARAM_OPTIONAL
16631667
Z_PARAM_BOOL(with_cas)
16641668
Z_PARAM_FUNC_EX(fci, fcc, 1, 0)
@@ -1816,6 +1820,7 @@ static void php_memc_setMulti_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_ke
18161820
MEMC_METHOD_INIT_VARS;
18171821

18181822
if (by_key) {
1823+
/* "Sa|ll" */
18191824
ZEND_PARSE_PARAMETERS_START(2, 4)
18201825
Z_PARAM_STR(server_key)
18211826
Z_PARAM_ARRAY(entries)
@@ -1824,6 +1829,7 @@ static void php_memc_setMulti_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_ke
18241829
Z_PARAM_LONG(ignored)
18251830
ZEND_PARSE_PARAMETERS_END();
18261831
} else {
1832+
/* "a|ll" */
18271833
ZEND_PARSE_PARAMETERS_START(1, 3)
18281834
Z_PARAM_ARRAY(entries)
18291835
Z_PARAM_OPTIONAL
@@ -2031,7 +2037,7 @@ static void php_memc_cas_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_key)
20312037
MEMC_METHOD_INIT_VARS;
20322038

20332039
if (by_key) {
2034-
/* zSSz|ll */
2040+
/* "zSSz|ll" */
20352041
ZEND_PARSE_PARAMETERS_START(4, 6)
20362042
Z_PARAM_ZVAL(zv_cas)
20372043
Z_PARAM_STR(server_key)
@@ -2042,7 +2048,7 @@ static void php_memc_cas_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_key)
20422048
Z_PARAM_LONG(ignored)
20432049
ZEND_PARSE_PARAMETERS_END();
20442050
} else {
2045-
/* zSz|ll */
2051+
/* "zSz|ll" */
20462052
ZEND_PARSE_PARAMETERS_START(3, 5)
20472053
Z_PARAM_ZVAL(zv_cas)
20482054
Z_PARAM_STR(key)
@@ -2137,15 +2143,15 @@ static void php_memc_delete_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_key)
21372143
MEMC_METHOD_INIT_VARS;
21382144

21392145
if (by_key) {
2140-
/* SS|l */
2146+
/* "SS|l" */
21412147
ZEND_PARSE_PARAMETERS_START(2, 3)
21422148
Z_PARAM_STR(server_key)
21432149
Z_PARAM_STR(key)
21442150
Z_PARAM_OPTIONAL
21452151
Z_PARAM_LONG(expiration)
21462152
ZEND_PARSE_PARAMETERS_END();
21472153
} else {
2148-
/* S|l */
2154+
/* "S|l" */
21492155
ZEND_PARSE_PARAMETERS_START(1, 2)
21502156
Z_PARAM_STR(key)
21512157
Z_PARAM_OPTIONAL
@@ -2185,15 +2191,15 @@ static void php_memc_deleteMulti_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by
21852191
MEMC_METHOD_INIT_VARS;
21862192

21872193
if (by_key) {
2188-
/* Sa/|l */
2194+
/* "Sa/|l" */
21892195
ZEND_PARSE_PARAMETERS_START(2, 3)
21902196
Z_PARAM_STR(server_key)
21912197
Z_PARAM_ARRAY_EX(entries, 0, 1)
21922198
Z_PARAM_OPTIONAL
21932199
Z_PARAM_LONG(expiration)
21942200
ZEND_PARSE_PARAMETERS_END();
21952201
} else {
2196-
/* a/|l */
2202+
/* "a/|l" */
21972203
ZEND_PARSE_PARAMETERS_START(1, 2)
21982204
Z_PARAM_ARRAY_EX(entries, 0, 1)
21992205
Z_PARAM_OPTIONAL
@@ -2246,6 +2252,7 @@ static void php_memc_incdec_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_key,
22462252
MEMC_METHOD_INIT_VARS;
22472253

22482254
if (!by_key) {
2255+
/* "S|lll" */
22492256
ZEND_PARSE_PARAMETERS_START(1, 4)
22502257
Z_PARAM_STR(key)
22512258
Z_PARAM_OPTIONAL
@@ -2254,6 +2261,7 @@ static void php_memc_incdec_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_key,
22542261
Z_PARAM_LONG(expiry)
22552262
ZEND_PARSE_PARAMETERS_END();
22562263
} else {
2264+
/* "SS|lll" */
22572265
ZEND_PARSE_PARAMETERS_START(2, 5)
22582266
Z_PARAM_STR(server_key)
22592267
Z_PARAM_STR(key)
@@ -2372,7 +2380,7 @@ PHP_METHOD(Memcached, addServer)
23722380
memcached_return status;
23732381
MEMC_METHOD_INIT_VARS;
23742382

2375-
/* Sa/|l */
2383+
/* "Sa/|l" */
23762384
ZEND_PARSE_PARAMETERS_START(2, 3)
23772385
Z_PARAM_STR(host)
23782386
Z_PARAM_LONG(port)
@@ -2406,7 +2414,7 @@ PHP_METHOD(Memcached, addServers)
24062414
memcached_return status;
24072415
MEMC_METHOD_INIT_VARS;
24082416

2409-
/* a/ */
2417+
/* "a/" */
24102418
ZEND_PARSE_PARAMETERS_START(1, 1)
24112419
Z_PARAM_ARRAY_EX(servers, 0, 1)
24122420
ZEND_PARSE_PARAMETERS_END();
@@ -2511,7 +2519,7 @@ PHP_METHOD(Memcached, getServerByKey)
25112519
memcached_return error;
25122520
MEMC_METHOD_INIT_VARS;
25132521

2514-
/* S */
2522+
/* "S" */
25152523
ZEND_PARSE_PARAMETERS_START(1, 1)
25162524
Z_PARAM_STR(server_key)
25172525
ZEND_PARSE_PARAMETERS_END();
@@ -2732,7 +2740,7 @@ PHP_METHOD(Memcached, getStats)
27322740
zend_string *args_string = NULL;
27332741
MEMC_METHOD_INIT_VARS;
27342742

2735-
/* |S! */
2743+
/* "|S!" */
27362744
ZEND_PARSE_PARAMETERS_START(0, 1)
27372745
Z_PARAM_OPTIONAL
27382746
Z_PARAM_STR_EX(args_string, 1, 0)
@@ -2832,7 +2840,7 @@ static PHP_METHOD(Memcached, flush)
28322840
memcached_return status;
28332841
MEMC_METHOD_INIT_VARS;
28342842

2835-
/* |l */
2843+
/* "|l" */
28362844
ZEND_PARSE_PARAMETERS_START(0, 1)
28372845
Z_PARAM_OPTIONAL
28382846
Z_PARAM_LONG(delay)
@@ -2859,7 +2867,7 @@ static PHP_METHOD(Memcached, getOption)
28592867
memcached_behavior flag;
28602868
MEMC_METHOD_INIT_VARS;
28612869

2862-
/* l */
2870+
/* "l" */
28632871
ZEND_PARSE_PARAMETERS_START(1, 1)
28642872
Z_PARAM_LONG(option)
28652873
ZEND_PARSE_PARAMETERS_END();
@@ -3112,7 +3120,7 @@ PHP_METHOD(Memcached, setBucket)
31123120
memcached_return rc;
31133121
MEMC_METHOD_INIT_VARS;
31143122

3115-
/* aa!l */
3123+
/* "aa!l" */
31163124
ZEND_PARSE_PARAMETERS_START(3, 3)
31173125
Z_PARAM_ARRAY(zserver_map)
31183126
Z_PARAM_ARRAY_EX(zforward_map, 1, 0)
@@ -3178,7 +3186,7 @@ static PHP_METHOD(Memcached, setOptions)
31783186

31793187
MEMC_METHOD_INIT_VARS;
31803188

3181-
/* a */
3189+
/* "a" */
31823190
ZEND_PARSE_PARAMETERS_START(1, 1)
31833191
Z_PARAM_ARRAY(options)
31843192
ZEND_PARSE_PARAMETERS_END();
@@ -3209,7 +3217,7 @@ static PHP_METHOD(Memcached, setOption)
32093217
zval *value;
32103218
MEMC_METHOD_INIT_VARS;
32113219

3212-
/* lz/ */
3220+
/* "lz/" */
32133221
ZEND_PARSE_PARAMETERS_START(2, 2)
32143222
Z_PARAM_LONG(option)
32153223
Z_PARAM_ZVAL_EX(value, 0, 1)
@@ -3230,7 +3238,7 @@ static PHP_METHOD(Memcached, setSaslAuthData)
32303238
memcached_return status;
32313239
zend_string *user, *pass;
32323240

3233-
/* SS/ */
3241+
/* "SS/" */
32343242
ZEND_PARSE_PARAMETERS_START(2, 2)
32353243
Z_PARAM_STR(user)
32363244
Z_PARAM_STR(pass)
@@ -3716,7 +3724,7 @@ PHP_METHOD(MemcachedServer, run)
37163724
php_memc_server_t *intern;
37173725
intern = Z_MEMC_SERVER_P(getThis());
37183726

3719-
/* S */
3727+
/* "S" */
37203728
ZEND_PARSE_PARAMETERS_START(1, 1)
37213729
Z_PARAM_STR(address)
37223730
ZEND_PARSE_PARAMETERS_END();
@@ -3738,7 +3746,7 @@ PHP_METHOD(MemcachedServer, on)
37383746
zend_fcall_info_cache fci_cache;
37393747
zend_bool rc = 0;
37403748

3741-
/* lf! */
3749+
/* "lf!" */
37423750
ZEND_PARSE_PARAMETERS_START(2, 2)
37433751
Z_PARAM_LONG(event)
37443752
Z_PARAM_FUNC_EX(fci, fci_cache, 1, 0)

0 commit comments

Comments
 (0)