Skip to content

Commit 04e4c6d

Browse files
committed
uri: Use local variable for the URI in uri_get_debug_properties()
This makes the code a little less verbose.
1 parent e11bcad commit 04e4c6d

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

ext/uri/php_uri.c

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -58,42 +58,43 @@ static HashTable *uri_get_debug_properties(zend_object *object)
5858
HashTable *std_properties = zend_std_get_properties(object);
5959
HashTable *result = zend_array_dup(std_properties);
6060

61-
if (UNEXPECTED(internal_uri->uri == NULL)) {
61+
const php_uri_parser * const parser = internal_uri->parser;
62+
void * const uri = internal_uri->uri;
63+
64+
if (UNEXPECTED(uri == NULL)) {
6265
return result;
6366
}
6467

65-
const php_uri_parser *parser = internal_uri->parser;
66-
6768
zval tmp;
68-
if (parser->property_handler.scheme.read(internal_uri->uri, PHP_URI_COMPONENT_READ_MODE_RAW, &tmp) == SUCCESS) {
69+
if (parser->property_handler.scheme.read(uri, PHP_URI_COMPONENT_READ_MODE_RAW, &tmp) == SUCCESS) {
6970
zend_hash_update(result, ZSTR_KNOWN(ZEND_STR_SCHEME), &tmp);
7071
}
7172

72-
if (parser->property_handler.username.read(internal_uri->uri, PHP_URI_COMPONENT_READ_MODE_RAW, &tmp) == SUCCESS) {
73+
if (parser->property_handler.username.read(uri, PHP_URI_COMPONENT_READ_MODE_RAW, &tmp) == SUCCESS) {
7374
zend_hash_update(result, ZSTR_KNOWN(ZEND_STR_USERNAME), &tmp);
7475
}
7576

76-
if (parser->property_handler.password.read(internal_uri->uri, PHP_URI_COMPONENT_READ_MODE_RAW, &tmp) == SUCCESS) {
77+
if (parser->property_handler.password.read(uri, PHP_URI_COMPONENT_READ_MODE_RAW, &tmp) == SUCCESS) {
7778
zend_hash_update(result, ZSTR_KNOWN(ZEND_STR_PASSWORD), &tmp);
7879
}
7980

80-
if (parser->property_handler.host.read(internal_uri->uri, PHP_URI_COMPONENT_READ_MODE_RAW, &tmp) == SUCCESS) {
81+
if (parser->property_handler.host.read(uri, PHP_URI_COMPONENT_READ_MODE_RAW, &tmp) == SUCCESS) {
8182
zend_hash_update(result, ZSTR_KNOWN(ZEND_STR_HOST), &tmp);
8283
}
8384

84-
if (parser->property_handler.port.read(internal_uri->uri, PHP_URI_COMPONENT_READ_MODE_RAW, &tmp) == SUCCESS) {
85+
if (parser->property_handler.port.read(uri, PHP_URI_COMPONENT_READ_MODE_RAW, &tmp) == SUCCESS) {
8586
zend_hash_update(result, ZSTR_KNOWN(ZEND_STR_PORT), &tmp);
8687
}
8788

88-
if (parser->property_handler.path.read(internal_uri->uri, PHP_URI_COMPONENT_READ_MODE_RAW, &tmp) == SUCCESS) {
89+
if (parser->property_handler.path.read(uri, PHP_URI_COMPONENT_READ_MODE_RAW, &tmp) == SUCCESS) {
8990
zend_hash_update(result, ZSTR_KNOWN(ZEND_STR_PATH), &tmp);
9091
}
9192

92-
if (parser->property_handler.query.read(internal_uri->uri, PHP_URI_COMPONENT_READ_MODE_RAW, &tmp) == SUCCESS) {
93+
if (parser->property_handler.query.read(uri, PHP_URI_COMPONENT_READ_MODE_RAW, &tmp) == SUCCESS) {
9394
zend_hash_update(result, ZSTR_KNOWN(ZEND_STR_QUERY), &tmp);
9495
}
9596

96-
if (parser->property_handler.fragment.read(internal_uri->uri, PHP_URI_COMPONENT_READ_MODE_RAW, &tmp) == SUCCESS) {
97+
if (parser->property_handler.fragment.read(uri, PHP_URI_COMPONENT_READ_MODE_RAW, &tmp) == SUCCESS) {
9798
zend_hash_update(result, ZSTR_KNOWN(ZEND_STR_FRAGMENT), &tmp);
9899
}
99100

0 commit comments

Comments
 (0)