Skip to content

Commit c79d568

Browse files
arnaud-lbGirgias
andauthored
Apply suggestions from code review
Co-authored-by: Gina Peter Banyard <girgias@php.net>
1 parent 0731ca6 commit c79d568

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Zend/zend_API.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5392,7 +5392,7 @@ static zend_string *try_parse_string(const char *str, size_t len, char quote) {
53925392
}
53935393

53945394
ZEND_API zend_result zend_get_default_from_arg_info(
5395-
zval *default_value_zval, zend_arg_info *arg_info)
5395+
zval *default_value_zval, const zend_arg_info *arg_info)
53965396
{
53975397
zend_string *default_value = arg_info->default_value;
53985398
if (!default_value) {
@@ -5401,13 +5401,13 @@ ZEND_API zend_result zend_get_default_from_arg_info(
54015401

54025402
/* Avoid going through the full AST machinery for some simple and common cases. */
54035403
zend_ulong lval;
5404-
if (zend_string_equals_cstr(default_value, "null", strlen("null"))) {
5404+
if (zend_string_equals_literal(default_value, "null")) {
54055405
ZVAL_NULL(default_value_zval);
54065406
return SUCCESS;
5407-
} else if (zend_string_equals_cstr(default_value, "true", strlen("true"))) {
5407+
} else if (zend_string_equals_literal(default_value, "true")) {
54085408
ZVAL_TRUE(default_value_zval);
54095409
return SUCCESS;
5410-
} else if (zend_string_equals_cstr(default_value, "false", strlen("false"))) {
5410+
} else if (zend_string_equals_literal(default_value, "false")) {
54115411
ZVAL_FALSE(default_value_zval);
54125412
return SUCCESS;
54135413
} else if (ZSTR_LEN(default_value) >= 2
@@ -5419,7 +5419,7 @@ ZEND_API zend_result zend_get_default_from_arg_info(
54195419
ZVAL_STR(default_value_zval, str);
54205420
return SUCCESS;
54215421
}
5422-
} else if (zend_string_equals_cstr(default_value, "[]", strlen("[]"))) {
5422+
} else if (zend_string_equals_literal(default_value, "[]")) {
54235423
ZVAL_EMPTY_ARRAY(default_value_zval);
54245424
return SUCCESS;
54255425
} else if (ZEND_HANDLE_NUMERIC(default_value, lval)) {

Zend/zend_inheritance.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -953,7 +953,7 @@ static ZEND_COLD zend_string *zend_get_function_declaration(
953953
}
954954

955955
smart_str_appendc(&str, '$');
956-
smart_str_appendl(&str, ZSTR_VAL(arg_info->name), ZSTR_LEN(arg_info->name));
956+
smart_str_append(&str, arg_info->name);
957957

958958
if (i >= required && !ZEND_ARG_IS_VARIADIC(arg_info)) {
959959
smart_str_appends(&str, " = ");

0 commit comments

Comments
 (0)