Skip to content

Commit 25de02b

Browse files
authored
uri: Improve type safety for php_uri_parser_rfc3986_userinfo_*() (php#20244)
The signature for these functions does not need to match a specific function pointer signature, thus there is no need for a `void*` to take the uri.
1 parent 40a42cf commit 25de02b

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

ext/uri/uri_parser_rfc3986.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ static zend_result php_uri_parser_rfc3986_scheme_write(void *uri, zval *value, z
149149
}
150150
}
151151

152-
ZEND_ATTRIBUTE_NONNULL zend_result php_uri_parser_rfc3986_userinfo_read(void *uri, php_uri_component_read_mode read_mode, zval *retval)
152+
ZEND_ATTRIBUTE_NONNULL zend_result php_uri_parser_rfc3986_userinfo_read(php_uri_parser_rfc3986_uris *uri, php_uri_component_read_mode read_mode, zval *retval)
153153
{
154154
const UriUriA *uriparser_uri = get_uri_for_reading(uri, read_mode);
155155

@@ -162,7 +162,7 @@ ZEND_ATTRIBUTE_NONNULL zend_result php_uri_parser_rfc3986_userinfo_read(void *ur
162162
return SUCCESS;
163163
}
164164

165-
zend_result php_uri_parser_rfc3986_userinfo_write(void *uri, zval *value, zval *errors)
165+
zend_result php_uri_parser_rfc3986_userinfo_write(php_uri_parser_rfc3986_uris *uri, zval *value, zval *errors)
166166
{
167167
UriUriA *uriparser_uri = get_uri_for_writing(uri);
168168
int result;

ext/uri/uri_parser_rfc3986.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ PHPAPI extern const php_uri_parser php_uri_parser_rfc3986;
2323

2424
typedef struct php_uri_parser_rfc3986_uris php_uri_parser_rfc3986_uris;
2525

26-
zend_result php_uri_parser_rfc3986_userinfo_read(void *uri, php_uri_component_read_mode read_mode, zval *retval);
27-
zend_result php_uri_parser_rfc3986_userinfo_write(void *uri, zval *value, zval *errors);
26+
zend_result php_uri_parser_rfc3986_userinfo_read(php_uri_parser_rfc3986_uris *uri, php_uri_component_read_mode read_mode, zval *retval);
27+
zend_result php_uri_parser_rfc3986_userinfo_write(php_uri_parser_rfc3986_uris *uri, zval *value, zval *errors);
2828

2929
php_uri_parser_rfc3986_uris *php_uri_parser_rfc3986_parse_ex(const char *uri_str, size_t uri_str_len, const php_uri_parser_rfc3986_uris *uriparser_base_url, bool silent);
3030

0 commit comments

Comments
 (0)