php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

uri: Mark local pointers as const in URI parser implementations (#19581)

Browse Source 
* uri: Mark local pointers as `const` in uri_parser_whatwg.c

* uri: Mark local pointers as `const` in uri_parser_rfc3986.c
This commit is contained in:
Tim Düsterhus
2025-08-25 15:08:29 +02:00
committed by GitHub
parent 7e5ad5caf8
commit 5127a229bf
2 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ext/uri/uri_parser_rfc3986.c
View File

@@ -98,7 +98,7 @@ ZEND_ATTRIBUTE_NONNULL static UriUriA *uriparser_read_uri(uriparser_uris_t *urip
ZEND_ATTRIBUTE_NONNULL static zend_result uriparser_read_scheme(const uri_internal_t *internal_uri, uri_component_read_mode_t read_mode, zval *retval)
{
UriUriA *uriparser_uri = uriparser_read_uri(internal_uri->uri, read_mode);
const UriUriA *uriparser_uri = uriparser_read_uri(internal_uri->uri, read_mode);
ZEND_ASSERT(uriparser_uri != NULL);
if (uriparser_uri->scheme.first != NULL && uriparser_uri->scheme.afterLast != NULL) {
@@ -113,7 +113,7 @@ ZEND_ATTRIBUTE_NONNULL static zend_result uriparser_read_scheme(const uri_intern
ZEND_ATTRIBUTE_NONNULL zend_result uriparser_read_userinfo(const uri_internal_t *internal_uri, uri_component_read_mode_t read_mode, zval *retval)
{
UriUriA *uriparser_uri = uriparser_read_uri(internal_uri->uri, read_mode);
const UriUriA *uriparser_uri = uriparser_read_uri(internal_uri->uri, read_mode);
ZEND_ASSERT(uriparser_uri != NULL);
if (uriparser_uri->userInfo.first != NULL && uriparser_uri->userInfo.afterLast != NULL) {
@@ -127,7 +127,7 @@ ZEND_ATTRIBUTE_NONNULL zend_result uriparser_read_userinfo(const uri_internal_t
ZEND_ATTRIBUTE_NONNULL static zend_result uriparser_read_username(const uri_internal_t *internal_uri, uri_component_read_mode_t read_mode, zval *retval)
{
UriUriA *uriparser_uri = uriparser_read_uri(internal_uri->uri, read_mode);
const UriUriA *uriparser_uri = uriparser_read_uri(internal_uri->uri, read_mode);
ZEND_ASSERT(uriparser_uri != NULL);
if (uriparser_uri->userInfo.first != NULL && uriparser_uri->userInfo.afterLast != NULL) {
@@ -150,7 +150,7 @@ ZEND_ATTRIBUTE_NONNULL static zend_result uriparser_read_username(const uri_inte
ZEND_ATTRIBUTE_NONNULL static zend_result uriparser_read_password(const uri_internal_t *internal_uri, uri_component_read_mode_t read_mode, zval *retval)
{
UriUriA *uriparser_uri = uriparser_read_uri(internal_uri->uri, read_mode);
const UriUriA *uriparser_uri = uriparser_read_uri(internal_uri->uri, read_mode);
ZEND_ASSERT(uriparser_uri != NULL);
if (uriparser_uri->userInfo.first != NULL && uriparser_uri->userInfo.afterLast != NULL) {
@@ -170,7 +170,7 @@ ZEND_ATTRIBUTE_NONNULL static zend_result uriparser_read_password(const uri_inte
ZEND_ATTRIBUTE_NONNULL static zend_result uriparser_read_host(const uri_internal_t *internal_uri, uri_component_read_mode_t read_mode, zval *retval)
{
UriUriA *uriparser_uri = uriparser_read_uri(internal_uri->uri, read_mode);
const UriUriA *uriparser_uri = uriparser_read_uri(internal_uri->uri, read_mode);
ZEND_ASSERT(uriparser_uri != NULL);
if (uriparser_uri->hostText.first != NULL && uriparser_uri->hostText.afterLast != NULL) {
@@ -206,7 +206,7 @@ ZEND_ATTRIBUTE_NONNULL static size_t str_to_int(const char *str, size_t len)
ZEND_ATTRIBUTE_NONNULL static zend_result uriparser_read_port(const uri_internal_t *internal_uri, uri_component_read_mode_t read_mode, zval *retval)
{
UriUriA *uriparser_uri = uriparser_read_uri(internal_uri->uri, read_mode);
const UriUriA *uriparser_uri = uriparser_read_uri(internal_uri->uri, read_mode);
ZEND_ASSERT(uriparser_uri != NULL);
if (uriparser_uri->portText.first != NULL && uriparser_uri->portText.afterLast != NULL) {
@@ -220,7 +220,7 @@ ZEND_ATTRIBUTE_NONNULL static zend_result uriparser_read_port(const uri_internal
ZEND_ATTRIBUTE_NONNULL static zend_result uriparser_read_path(const uri_internal_t *internal_uri, uri_component_read_mode_t read_mode, zval *retval)
{
UriUriA *uriparser_uri = uriparser_read_uri(internal_uri->uri, read_mode);
const UriUriA *uriparser_uri = uriparser_read_uri(internal_uri->uri, read_mode);
ZEND_ASSERT(uriparser_uri != NULL);
if (uriparser_uri->pathHead != NULL) {
@@ -249,7 +249,7 @@ ZEND_ATTRIBUTE_NONNULL static zend_result uriparser_read_path(const uri_internal
ZEND_ATTRIBUTE_NONNULL static zend_result uriparser_read_query(const uri_internal_t *internal_uri, uri_component_read_mode_t read_mode, zval *retval)
{
UriUriA *uriparser_uri = uriparser_read_uri(internal_uri->uri, read_mode);
const UriUriA *uriparser_uri = uriparser_read_uri(internal_uri->uri, read_mode);
ZEND_ASSERT(uriparser_uri != NULL);
if (uriparser_uri->query.first != NULL && uriparser_uri->query.afterLast != NULL) {
@@ -263,7 +263,7 @@ ZEND_ATTRIBUTE_NONNULL static zend_result uriparser_read_query(const uri_interna
ZEND_ATTRIBUTE_NONNULL static zend_result uriparser_read_fragment(const uri_internal_t *internal_uri, uri_component_read_mode_t read_mode, zval *retval)
{
UriUriA *uriparser_uri = uriparser_read_uri(internal_uri->uri, read_mode);
const UriUriA *uriparser_uri = uriparser_read_uri(internal_uri->uri, read_mode);
ZEND_ASSERT(uriparser_uri != NULL);
if (uriparser_uri->fragment.first != NULL && uriparser_uri->fragment.afterLast != NULL) {
@@ -348,7 +348,7 @@ void *uriparser_parse_uri(const char *uri_str, size_t uri_str_len, const void *b
* is discarded altogether. */
ZEND_ATTRIBUTE_NONNULL static void *uriparser_clone_uri(void *uri)
{
uriparser_uris_t *uriparser_uris = uri;
const uriparser_uris_t *uriparser_uris = uri;
uriparser_uris_t *new_uriparser_uris = uriparser_create_uris();
uriparser_copy_uri(&new_uriparser_uris->uri, &uriparser_uris->uri);
@@ -363,7 +363,7 @@ ZEND_ATTRIBUTE_NONNULL static void *uriparser_clone_uri(void *uri)
ZEND_ATTRIBUTE_NONNULL static zend_string *uriparser_uri_to_string(void *uri, uri_recomposition_mode_t recomposition_mode, bool exclude_fragment)
{
uriparser_uris_t *uriparser_uris = uri;
UriUriA *uriparser_uri;
const UriUriA *uriparser_uri;
if (recomposition_mode == URI_RECOMPOSITION_RAW_ASCII || recomposition_mode == URI_RECOMPOSITION_RAW_UNICODE) {
uriparser_uri = &uriparser_uris->uri;

20
ext/uri/uri_parser_whatwg.c
View File

@@ -260,7 +260,7 @@ static lxb_status_t lexbor_serialize_callback(const lxb_char_t *data, size_t len
static zend_result lexbor_read_scheme(const struct uri_internal_t *internal_uri, uri_component_read_mode_t read_mode, zval *retval)
{
lxb_url_t *lexbor_uri = internal_uri->uri;
const lxb_url_t *lexbor_uri = internal_uri->uri;
ZEND_ASSERT(lexbor_uri->scheme.type != LXB_URL_SCHEMEL_TYPE__UNDEF);
@@ -287,7 +287,7 @@ static zend_result lexbor_write_scheme(struct uri_internal_t *internal_uri, zval
static zend_result lexbor_read_username(const struct uri_internal_t *internal_uri, uri_component_read_mode_t read_mode, zval *retval)
{
lxb_url_t *lexbor_uri = internal_uri->uri;
const lxb_url_t *lexbor_uri = internal_uri->uri;
if (lexbor_uri->username.length) {
ZVAL_STRINGL(retval, (const char *) lexbor_uri->username.data, lexbor_uri->username.length);
@@ -316,7 +316,7 @@ static zend_result lexbor_write_username(uri_internal_t *internal_uri, zval *val
static zend_result lexbor_read_password(const struct uri_internal_t *internal_uri, uri_component_read_mode_t read_mode, zval *retval)
{
lxb_url_t *lexbor_uri = internal_uri->uri;
const lxb_url_t *lexbor_uri = internal_uri->uri;
if (lexbor_uri->password.length > 0) {
ZVAL_STRINGL(retval, (const char *) lexbor_uri->password.data, lexbor_uri->password.length);
@@ -356,7 +356,7 @@ static zend_result init_idna(void)
static zend_result lexbor_read_host(const struct uri_internal_t *internal_uri, uri_component_read_mode_t read_mode, zval *retval)
{
lxb_url_t *lexbor_uri = internal_uri->uri;
const lxb_url_t *lexbor_uri = internal_uri->uri;
if (lexbor_uri->host.type == LXB_URL_HOST_TYPE_IPV4) {
smart_str host_str = {0};
@@ -419,7 +419,7 @@ static zend_result lexbor_write_host(struct uri_internal_t *internal_uri, zval *
static zend_result lexbor_read_port(const struct uri_internal_t *internal_uri, uri_component_read_mode_t read_mode, zval *retval)
{
lxb_url_t *lexbor_uri = internal_uri->uri;
const lxb_url_t *lexbor_uri = internal_uri->uri;
if (lexbor_uri->has_port) {
ZVAL_LONG(retval, lexbor_uri->port);
@@ -448,7 +448,7 @@ static zend_result lexbor_write_port(struct uri_internal_t *internal_uri, zval *
static zend_result lexbor_read_path(const struct uri_internal_t *internal_uri, uri_component_read_mode_t read_mode, zval *retval)
{
lxb_url_t *lexbor_uri = internal_uri->uri;
const lxb_url_t *lexbor_uri = internal_uri->uri;
if (lexbor_uri->path.str.length) {
ZVAL_STRINGL(retval, (const char *) lexbor_uri->path.str.data, lexbor_uri->path.str.length);
@@ -477,7 +477,7 @@ static zend_result lexbor_write_path(struct uri_internal_t *internal_uri, zval *
static zend_result lexbor_read_query(const struct uri_internal_t *internal_uri, uri_component_read_mode_t read_mode, zval *retval)
{
lxb_url_t *lexbor_uri = internal_uri->uri;
const lxb_url_t *lexbor_uri = internal_uri->uri;
if (lexbor_uri->query.length) {
ZVAL_STRINGL(retval, (const char *) lexbor_uri->query.data, lexbor_uri->query.length);
@@ -506,7 +506,7 @@ static zend_result lexbor_write_query(struct uri_internal_t *internal_uri, zval
static zend_result lexbor_read_fragment(const struct uri_internal_t *internal_uri, uri_component_read_mode_t read_mode, zval *retval)
{
lxb_url_t *lexbor_uri = internal_uri->uri;
const lxb_url_t *lexbor_uri = internal_uri->uri;
if (lexbor_uri->fragment.length) {
ZVAL_STRINGL(retval, (const char *) lexbor_uri->fragment.data, lexbor_uri->fragment.length);
@@ -586,14 +586,14 @@ static void *lexbor_parse_uri(const char *uri_str, size_t uri_str_len, const voi
static void *lexbor_clone_uri(void *uri)
{
lxb_url_t *lexbor_uri = (lxb_url_t *) uri;
const lxb_url_t *lexbor_uri = uri;
return lxb_url_clone(lexbor_parser.mraw, lexbor_uri);
}
static zend_string *lexbor_uri_to_string(void *uri, uri_recomposition_mode_t recomposition_mode, bool exclude_fragment)
{
lxb_url_t *lexbor_uri = (lxb_url_t *) uri;
const lxb_url_t *lexbor_uri = uri;
smart_str uri_str = {0};
switch (recomposition_mode) {