Skip to content

Commit f734e8a

Browse files
committed
uri: Remove useless non-NULL assertions in uri_parser_rfc3986.c
The value of `uriparser_uri` is dereferenced *immediately* after the assertion, making it redundant for both the human reader and the compiler. In case of the normalized_uri, the pointer is trivially non-NULL, since it is referring to a struct member at not-the-first position. Generally speaking, unless something is checked for `NULL` one can assume it to never be `NULL`.
1 parent f6c3e46 commit f734e8a

File tree

1 file changed

+0
-9
lines changed

1 file changed

+0
-9
lines changed

ext/uri/uri_parser_rfc3986.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ ZEND_ATTRIBUTE_NONNULL static UriUriA *get_uri_for_reading(php_uri_parser_rfc398
9797
ZEND_ATTRIBUTE_NONNULL static zend_result php_uri_parser_rfc3986_scheme_read(const uri_internal_t *internal_uri, uri_component_read_mode_t read_mode, zval *retval)
9898
{
9999
const UriUriA *uriparser_uri = get_uri_for_reading(internal_uri->uri, read_mode);
100-
ZEND_ASSERT(uriparser_uri != NULL);
101100

102101
if (uriparser_uri->scheme.first != NULL && uriparser_uri->scheme.afterLast != NULL) {
103102
ZVAL_STRINGL(retval, uriparser_uri->scheme.first, get_text_range_length(&uriparser_uri->scheme));
@@ -111,7 +110,6 @@ ZEND_ATTRIBUTE_NONNULL static zend_result php_uri_parser_rfc3986_scheme_read(con
111110
ZEND_ATTRIBUTE_NONNULL zend_result php_uri_parser_rfc3986_userinfo_read(const uri_internal_t *internal_uri, uri_component_read_mode_t read_mode, zval *retval)
112111
{
113112
const UriUriA *uriparser_uri = get_uri_for_reading(internal_uri->uri, read_mode);
114-
ZEND_ASSERT(uriparser_uri != NULL);
115113

116114
if (uriparser_uri->userInfo.first != NULL && uriparser_uri->userInfo.afterLast != NULL) {
117115
ZVAL_STRINGL(retval, uriparser_uri->userInfo.first, get_text_range_length(&uriparser_uri->userInfo));
@@ -125,7 +123,6 @@ ZEND_ATTRIBUTE_NONNULL zend_result php_uri_parser_rfc3986_userinfo_read(const ur
125123
ZEND_ATTRIBUTE_NONNULL static zend_result php_uri_parser_rfc3986_username_read(const uri_internal_t *internal_uri, uri_component_read_mode_t read_mode, zval *retval)
126124
{
127125
const UriUriA *uriparser_uri = get_uri_for_reading(internal_uri->uri, read_mode);
128-
ZEND_ASSERT(uriparser_uri != NULL);
129126

130127
if (uriparser_uri->userInfo.first != NULL && uriparser_uri->userInfo.afterLast != NULL) {
131128
size_t length = get_text_range_length(&uriparser_uri->userInfo);
@@ -148,7 +145,6 @@ ZEND_ATTRIBUTE_NONNULL static zend_result php_uri_parser_rfc3986_username_read(c
148145
ZEND_ATTRIBUTE_NONNULL static zend_result php_uri_parser_rfc3986_password_read(const uri_internal_t *internal_uri, uri_component_read_mode_t read_mode, zval *retval)
149146
{
150147
const UriUriA *uriparser_uri = get_uri_for_reading(internal_uri->uri, read_mode);
151-
ZEND_ASSERT(uriparser_uri != NULL);
152148

153149
if (uriparser_uri->userInfo.first != NULL && uriparser_uri->userInfo.afterLast != NULL) {
154150
const char *c = memchr(uriparser_uri->userInfo.first, ':', get_text_range_length(&uriparser_uri->userInfo));
@@ -168,7 +164,6 @@ ZEND_ATTRIBUTE_NONNULL static zend_result php_uri_parser_rfc3986_password_read(c
168164
ZEND_ATTRIBUTE_NONNULL static zend_result php_uri_parser_rfc3986_host_read(const uri_internal_t *internal_uri, uri_component_read_mode_t read_mode, zval *retval)
169165
{
170166
const UriUriA *uriparser_uri = get_uri_for_reading(internal_uri->uri, read_mode);
171-
ZEND_ASSERT(uriparser_uri != NULL);
172167

173168
if (uriparser_uri->hostText.first != NULL && uriparser_uri->hostText.afterLast != NULL) {
174169
if (uriparser_uri->hostData.ip6 != NULL || uriparser_uri->hostData.ipFuture.first != NULL) {
@@ -204,7 +199,6 @@ ZEND_ATTRIBUTE_NONNULL static size_t str_to_int(const char *str, size_t len)
204199
ZEND_ATTRIBUTE_NONNULL static zend_result php_uri_parser_rfc3986_port_read(const uri_internal_t *internal_uri, uri_component_read_mode_t read_mode, zval *retval)
205200
{
206201
const UriUriA *uriparser_uri = get_uri_for_reading(internal_uri->uri, read_mode);
207-
ZEND_ASSERT(uriparser_uri != NULL);
208202

209203
if (uriparser_uri->portText.first != NULL && uriparser_uri->portText.afterLast != NULL) {
210204
ZVAL_LONG(retval, str_to_int(uriparser_uri->portText.first, get_text_range_length(&uriparser_uri->portText)));
@@ -218,7 +212,6 @@ ZEND_ATTRIBUTE_NONNULL static zend_result php_uri_parser_rfc3986_port_read(const
218212
ZEND_ATTRIBUTE_NONNULL static zend_result php_uri_parser_rfc3986_path_read(const uri_internal_t *internal_uri, uri_component_read_mode_t read_mode, zval *retval)
219213
{
220214
const UriUriA *uriparser_uri = get_uri_for_reading(internal_uri->uri, read_mode);
221-
ZEND_ASSERT(uriparser_uri != NULL);
222215

223216
if (uriparser_uri->pathHead != NULL) {
224217
smart_str str = {0};
@@ -247,7 +240,6 @@ ZEND_ATTRIBUTE_NONNULL static zend_result php_uri_parser_rfc3986_path_read(const
247240
ZEND_ATTRIBUTE_NONNULL static zend_result php_uri_parser_rfc3986_query_read(const uri_internal_t *internal_uri, uri_component_read_mode_t read_mode, zval *retval)
248241
{
249242
const UriUriA *uriparser_uri = get_uri_for_reading(internal_uri->uri, read_mode);
250-
ZEND_ASSERT(uriparser_uri != NULL);
251243

252244
if (uriparser_uri->query.first != NULL && uriparser_uri->query.afterLast != NULL) {
253245
ZVAL_STRINGL(retval, uriparser_uri->query.first, get_text_range_length(&uriparser_uri->query));
@@ -261,7 +253,6 @@ ZEND_ATTRIBUTE_NONNULL static zend_result php_uri_parser_rfc3986_query_read(cons
261253
ZEND_ATTRIBUTE_NONNULL static zend_result php_uri_parser_rfc3986_fragment_read(const uri_internal_t *internal_uri, uri_component_read_mode_t read_mode, zval *retval)
262254
{
263255
const UriUriA *uriparser_uri = get_uri_for_reading(internal_uri->uri, read_mode);
264-
ZEND_ASSERT(uriparser_uri != NULL);
265256

266257
if (uriparser_uri->fragment.first != NULL && uriparser_uri->fragment.afterLast != NULL) {
267258
ZVAL_STRINGL(retval, uriparser_uri->fragment.first, get_text_range_length(&uriparser_uri->fragment));

0 commit comments

Comments
 (0)