Skip to content

Commit 827c24b

Browse files
TimWollaTimWolla
committed
standard: Use true / false instead of 1 / 0 for bool parameters
Changes done with Coccinelle: @r1@ identifier F; identifier p; typedef bool; parameter list [n1] PL1; parameter list [n2] PL2; @@ F(PL1, bool p, PL2) { ... } @r2@ identifier r1.F; expression list [r1.n1] EL1; expression list [r1.n2] EL2; @@ F(EL1, ( - 1 + true | - 0 + false ) , EL2)
1 parent 7f1cc0e commit 827c24b

File tree

5 files changed

+23
-22
lines changed

5 files changed

+23
-22
lines changed

‎ext/standard/array.c‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2049,7 +2049,7 @@ static zend_long php_extract_ref_prefix_if_exists(zend_array *arr, zend_array *s
20492049
continue;
20502050
}
20512051
}
2052-
php_prefix_varname(&final_name, prefix, ZSTR_VAL(var_name), ZSTR_LEN(var_name), 1);
2052+
php_prefix_varname(&final_name, prefix, ZSTR_VAL(var_name), ZSTR_LEN(var_name), true);
20532053
if (php_valid_var_name(Z_STRVAL(final_name), Z_STRLEN(final_name))) {
20542054
if (zend_string_equals(Z_STR(final_name), ZSTR_KNOWN(ZEND_STR_THIS))) {
20552055
zend_throw_error(NULL, "Cannot re-assign $this");
@@ -2103,7 +2103,7 @@ static zend_long php_extract_prefix_if_exists(zend_array *arr, zend_array *symbo
21032103
continue;
21042104
}
21052105
}
2106-
php_prefix_varname(&final_name, prefix, ZSTR_VAL(var_name), ZSTR_LEN(var_name), 1);
2106+
php_prefix_varname(&final_name, prefix, ZSTR_VAL(var_name), ZSTR_LEN(var_name), true);
21072107
if (php_valid_var_name(Z_STRVAL(final_name), Z_STRLEN(final_name))) {
21082108
if (zend_string_equals(Z_STR(final_name), ZSTR_KNOWN(ZEND_STR_THIS))) {
21092109
zend_throw_error(NULL, "Cannot re-assign $this");
@@ -2166,7 +2166,7 @@ static zend_long php_extract_ref_prefix_same(zend_array *arr, zend_array *symbol
21662166
}
21672167
}
21682168
prefix:
2169-
php_prefix_varname(&final_name, prefix, ZSTR_VAL(var_name), ZSTR_LEN(var_name), 1);
2169+
php_prefix_varname(&final_name, prefix, ZSTR_VAL(var_name), ZSTR_LEN(var_name), true);
21702170
if (php_valid_var_name(Z_STRVAL(final_name), Z_STRLEN(final_name))) {
21712171
if (zend_string_equals(Z_STR(final_name), ZSTR_KNOWN(ZEND_STR_THIS))) {
21722172
zend_throw_error(NULL, "Cannot re-assign $this");
@@ -2238,7 +2238,7 @@ static zend_long php_extract_prefix_same(zend_array *arr, zend_array *symbol_tab
22382238
}
22392239
}
22402240
prefix:
2241-
php_prefix_varname(&final_name, prefix, ZSTR_VAL(var_name), ZSTR_LEN(var_name), 1);
2241+
php_prefix_varname(&final_name, prefix, ZSTR_VAL(var_name), ZSTR_LEN(var_name), true);
22422242
if (php_valid_var_name(Z_STRVAL(final_name), Z_STRLEN(final_name))) {
22432243
if (zend_string_equals(Z_STR(final_name), ZSTR_KNOWN(ZEND_STR_THIS))) {
22442244
zend_throw_error(NULL, "Cannot re-assign $this");
@@ -2292,10 +2292,10 @@ static zend_long php_extract_ref_prefix_all(zend_array *arr, zend_array *symbol_
22922292
if (ZSTR_LEN(var_name) == 0) {
22932293
continue;
22942294
}
2295-
php_prefix_varname(&final_name, prefix, ZSTR_VAL(var_name), ZSTR_LEN(var_name), 1);
2295+
php_prefix_varname(&final_name, prefix, ZSTR_VAL(var_name), ZSTR_LEN(var_name), true);
22962296
} else {
22972297
zend_string *str = zend_long_to_str(num_key);
2298-
php_prefix_varname(&final_name, prefix, ZSTR_VAL(str), ZSTR_LEN(str), 1);
2298+
php_prefix_varname(&final_name, prefix, ZSTR_VAL(str), ZSTR_LEN(str), true);
22992299
zend_string_release_ex(str, 0);
23002300
}
23012301
if (php_valid_var_name(Z_STRVAL(final_name), Z_STRLEN(final_name))) {
@@ -2339,10 +2339,10 @@ static zend_long php_extract_prefix_all(zend_array *arr, zend_array *symbol_tabl
23392339
if (ZSTR_LEN(var_name) == 0) {
23402340
continue;
23412341
}
2342-
php_prefix_varname(&final_name, prefix, ZSTR_VAL(var_name), ZSTR_LEN(var_name), 1);
2342+
php_prefix_varname(&final_name, prefix, ZSTR_VAL(var_name), ZSTR_LEN(var_name), true);
23432343
} else {
23442344
zend_string *str = zend_long_to_str(num_key);
2345-
php_prefix_varname(&final_name, prefix, ZSTR_VAL(str), ZSTR_LEN(str), 1);
2345+
php_prefix_varname(&final_name, prefix, ZSTR_VAL(str), ZSTR_LEN(str), true);
23462346
zend_string_release_ex(str, 0);
23472347
}
23482348
if (php_valid_var_name(Z_STRVAL(final_name), Z_STRLEN(final_name))) {
@@ -2385,7 +2385,7 @@ static zend_long php_extract_ref_prefix_invalid(zend_array *arr, zend_array *sym
23852385
if (var_name) {
23862386
if (!php_valid_var_name(ZSTR_VAL(var_name), ZSTR_LEN(var_name))
23872387
|| zend_string_equals(var_name, ZSTR_KNOWN(ZEND_STR_THIS))) {
2388-
php_prefix_varname(&final_name, prefix, ZSTR_VAL(var_name), ZSTR_LEN(var_name), 1);
2388+
php_prefix_varname(&final_name, prefix, ZSTR_VAL(var_name), ZSTR_LEN(var_name), true);
23892389
if (!php_valid_var_name(Z_STRVAL(final_name), Z_STRLEN(final_name))) {
23902390
zval_ptr_dtor_str(&final_name);
23912391
continue;
@@ -2395,7 +2395,7 @@ static zend_long php_extract_ref_prefix_invalid(zend_array *arr, zend_array *sym
23952395
}
23962396
} else {
23972397
zend_string *str = zend_long_to_str(num_key);
2398-
php_prefix_varname(&final_name, prefix, ZSTR_VAL(str), ZSTR_LEN(str), 1);
2398+
php_prefix_varname(&final_name, prefix, ZSTR_VAL(str), ZSTR_LEN(str), true);
23992399
zend_string_release_ex(str, 0);
24002400
if (!php_valid_var_name(Z_STRVAL(final_name), Z_STRLEN(final_name))) {
24012401
zval_ptr_dtor_str(&final_name);
@@ -2440,7 +2440,7 @@ static zend_long php_extract_prefix_invalid(zend_array *arr, zend_array *symbol_
24402440
if (var_name) {
24412441
if (!php_valid_var_name(ZSTR_VAL(var_name), ZSTR_LEN(var_name))
24422442
|| zend_string_equals(var_name, ZSTR_KNOWN(ZEND_STR_THIS))) {
2443-
php_prefix_varname(&final_name, prefix, ZSTR_VAL(var_name), ZSTR_LEN(var_name), 1);
2443+
php_prefix_varname(&final_name, prefix, ZSTR_VAL(var_name), ZSTR_LEN(var_name), true);
24442444
if (!php_valid_var_name(Z_STRVAL(final_name), Z_STRLEN(final_name))) {
24452445
zval_ptr_dtor_str(&final_name);
24462446
continue;
@@ -2450,7 +2450,7 @@ static zend_long php_extract_prefix_invalid(zend_array *arr, zend_array *symbol_
24502450
}
24512451
} else {
24522452
zend_string *str = zend_long_to_str(num_key);
2453-
php_prefix_varname(&final_name, prefix, ZSTR_VAL(str), ZSTR_LEN(str), 1);
2453+
php_prefix_varname(&final_name, prefix, ZSTR_VAL(str), ZSTR_LEN(str), true);
24542454
zend_string_release_ex(str, 0);
24552455
if (!php_valid_var_name(Z_STRVAL(final_name), Z_STRLEN(final_name))) {
24562456
zval_ptr_dtor_str(&final_name);

‎ext/standard/browscap.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ static HashTable *browscap_entry_to_array(browser_data *bdata, browscap_entry *e
277277
zval tmp;
278278
HashTable *ht = zend_new_array(2 + (entry->parent ? 1 : 0) + (entry->kv_end - entry->kv_start));
279279

280-
ZVAL_STR(&tmp, browscap_convert_pattern(entry->pattern, 0));
280+
ZVAL_STR(&tmp, browscap_convert_pattern(entry->pattern, false));
281281
zend_string *key = ZSTR_INIT_LITERAL("browser_name_regex", 0);
282282
ZSTR_H(key) = zend_inline_hash_func("browser_name_regex", sizeof("browser_name_regex")-1);
283283
zend_hash_add_new(ht, key, &tmp);
@@ -485,7 +485,7 @@ PHP_INI_MH(OnChangeBrowscap)
485485
} else if (stage == PHP_INI_STAGE_ACTIVATE) {
486486
browser_data *bdata = &BROWSCAP_G(activation_bdata);
487487
if (bdata->filename[0] != '\0') {
488-
browscap_bdata_dtor(bdata, 0);
488+
browscap_bdata_dtor(bdata, false);
489489
}
490490
if (VCWD_REALPATH(ZSTR_VAL(new_value), bdata->filename) == NULL) {
491491
return FAILURE;
@@ -520,7 +520,7 @@ PHP_RSHUTDOWN_FUNCTION(browscap) /* {{{ */
520520
{
521521
browser_data *bdata = &BROWSCAP_G(activation_bdata);
522522
if (bdata->filename[0] != '\0') {
523-
browscap_bdata_dtor(bdata, 0);
523+
browscap_bdata_dtor(bdata, false);
524524
}
525525

526526
return SUCCESS;
@@ -529,7 +529,7 @@ PHP_RSHUTDOWN_FUNCTION(browscap) /* {{{ */
529529

530530
PHP_MSHUTDOWN_FUNCTION(browscap) /* {{{ */
531531
{
532-
browscap_bdata_dtor(&global_bdata, 1);
532+
browscap_bdata_dtor(&global_bdata, true);
533533

534534
return SUCCESS;
535535
}

‎ext/standard/html.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1017,7 +1017,7 @@ PHPAPI zend_string *php_unescape_html_entities(zend_string *str, int all, int fl
10171017
}
10181018

10191019
if (all) {
1020-
charset = determine_charset(hint_charset, /* quiet */ 0);
1020+
charset = determine_charset(hint_charset, /* quiet */ false);
10211021
} else {
10221022
charset = cs_8859_1; /* charset shouldn't matter, use ISO-8859-1 for performance */
10231023
}
@@ -1043,7 +1043,7 @@ PHPAPI zend_string *php_unescape_html_entities(zend_string *str, int all, int fl
10431043

10441044
PHPAPI zend_string *php_escape_html_entities(const unsigned char *old, size_t oldlen, int all, int flags, const char *hint_charset)
10451045
{
1046-
return php_escape_html_entities_ex(old, oldlen, all, flags, hint_charset, 1, /* quiet */ 0);
1046+
return php_escape_html_entities_ex(old, oldlen, all, flags, hint_charset, true, /* quiet */ false);
10471047
}
10481048

10491049
/* {{{ find_entity_for_char */

‎ext/standard/string.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5091,7 +5091,7 @@ static bool php_tag_find(char *tag, size_t len, const char *set) {
50915091

50925092
PHPAPI size_t php_strip_tags(char *rbuf, size_t len, const char *allow, size_t allow_len) /* {{{ */
50935093
{
5094-
return php_strip_tags_ex(rbuf, len, allow, allow_len, 0);
5094+
return php_strip_tags_ex(rbuf, len, allow, allow_len, false);
50955095
}
50965096
/* }}} */
50975097

‎ext/standard/var.c‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1023,7 +1023,8 @@ static void php_var_serialize_class(smart_str *buf, zval *struc, HashTable *ht,
10231023
if (php_var_serialize_get_sleep_props(&props, struc, ht) == SUCCESS) {
10241024
php_var_serialize_class_name(buf, struc);
10251025
php_var_serialize_nested_data(
1026-
buf, struc, &props, zend_hash_num_elements(&props), /* incomplete_class */ 0, var_hash, GC_REFCOUNT(&props) > 1);
1026+
buf, struc, &props, zend_hash_num_elements(&props), /* incomplete_class */ false, var_hash,
1027+
GC_REFCOUNT(&props) > 1);
10271028
}
10281029
zend_hash_destroy(&props);
10291030
}
@@ -1299,8 +1300,8 @@ static void php_var_serialize_intern(smart_str *buf, zval *struc, php_serialize_
12991300
smart_str_appendl(buf, "a:", 2);
13001301
myht = Z_ARRVAL_P(struc);
13011302
php_var_serialize_nested_data(
1302-
buf, struc, myht, zend_array_count(myht), /* incomplete_class */ 0, var_hash,
1303-
!is_root && (in_rcn_array || GC_REFCOUNT(myht) > 1));
1303+
buf, struc, myht, zend_array_count(myht), /* incomplete_class */ false, var_hash,
1304+
!is_root && (in_rcn_array || GC_REFCOUNT(myht) > 1));
13041305
return;
13051306
case IS_REFERENCE:
13061307
struc = Z_REFVAL_P(struc);

0 commit comments

Comments
 (0)