Skip to content

Remove code comments #23285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kamil-tekiela wants to merge 2 commits into
base: master
Choose a base branch
from
+3 −11
Open

Remove code comments #23285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9bcf276
Remove WTF comments left during code copy
kamil-tekiela Aug 14, 2026
8be44f3
Remove returns after zend_error_noreturn
kamil-tekiela Aug 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions Zend/zend_enum.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,6 @@ static int zend_implement_unit_enum(zend_class_entry *interface, zend_class_entr
zend_error_noreturn(E_ERROR, "Non-enum class %s cannot implement interface %s",
ZSTR_VAL(class_type->name),
ZSTR_VAL(interface->name));

return FAILURE;
}

static int zend_implement_backed_enum(zend_class_entry *interface, zend_class_entry *class_type)
Expand All @@ -153,14 +151,12 @@ static int zend_implement_backed_enum(zend_class_entry *interface, zend_class_en
zend_error_noreturn(E_ERROR, "Non-enum class %s cannot implement interface %s",
ZSTR_VAL(class_type->name),
ZSTR_VAL(interface->name));
return FAILURE;
}

if (class_type->enum_backing_type == IS_UNDEF) {
zend_error_noreturn(E_ERROR, "Non-backed enum %s cannot implement interface %s",
ZSTR_VAL(class_type->name),
ZSTR_VAL(interface->name));
return FAILURE;
}

return SUCCESS;
Expand Down
1 change: 0 additions & 1 deletion Zend/zend_exceptions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ static int zend_implement_throwable(zend_class_entry *interface, zend_class_entr
zend_get_object_type_uc(class_type),
ZSTR_VAL(class_type->name),
ZSTR_VAL(interface->name));
return FAILURE;
}
/* }}} */

Expand Down
1 change: 0 additions & 1 deletion Zend/zend_interfaces.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,6 @@ static int zend_implement_traversable(zend_class_entry *interface, zend_class_en
ZSTR_VAL(zend_ce_traversable->name),
ZSTR_VAL(zend_ce_iterator->name),
ZSTR_VAL(zend_ce_aggregate->name));
return FAILURE;
}
/* }}} */

Expand Down
2 changes: 0 additions & 2 deletions Zend/zend_object_handlers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,8 +232,6 @@ ZEND_API HashTable *zend_std_get_debug_info(zend_object *object, int *is_temp) /
}

zend_error_noreturn(E_ERROR, ZEND_DEBUGINFO_FUNC_NAME "() must return an array");

return NULL; /* Compilers are dumb and don't understand that noreturn means that the function does NOT need a return value... */
}
/* }}} */

Expand Down
1 change: 0 additions & 1 deletion ext/standard/io_poll.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,6 @@ static int php_stream_poll_handle_implement_interface(zend_class_entry *interfac
{
if (implementor->type == ZEND_USER_CLASS) {
zend_error_noreturn(E_ERROR, "Io\\Poll\\Handle cannot be implemented by user classes");
return FAILURE;
}

return SUCCESS;
Expand Down
5 changes: 3 additions & 2 deletions sapi/fpm/fpm/fpm_env.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,9 @@ void unsetenv(const char *name) /* {{{ */
int del = 0;

while(environ[ct] != NULL) {
if (nvmatch(name, environ[ct]) != 0) del=ct; /* <--- WTF?! */
{ ct++; } /* <--- WTF?! */
if (nvmatch(name, environ[ct]) != 0)
del = ct;
ct++;
}
/* isn't needed free here?? */
environ[del] = environ[ct-1];
Expand Down
Loading