Skip to content

[%pS migration] Use %pS in ext/mysqli #23159

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

Draft
DanielEScherzer wants to merge 1 commit into
base: master
Choose a base branch
from
+20 −20
Draft

[%pS migration] Use %pS in ext/mysqli #23159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions ext/mysqli/mysqli.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,8 +256,8 @@ zval *mysqli_write_property(zend_object *object, zend_string *name, zval *value,
const mysqli_prop_handler *hnd = zend_hash_find_ptr(obj->prop_handler, name);
if (hnd) {
if (!hnd->write_func) {
zend_throw_error(NULL, "Cannot write read-only property %s::$%s",
ZSTR_VAL(object->ce->name), ZSTR_VAL(name));
zend_throw_error(NULL, "Cannot write read-only property %pS::$%pS",
object->ce->name, name);
return &EG(error_zval);
}

Expand Down Expand Up @@ -402,7 +402,7 @@ static MYSQLND *mysqli_convert_zv_to_mysqlnd(zval * zv)
mysqli_object *intern = Z_MYSQLI_P(zv);
if (!(my_res = (MYSQLI_RESOURCE *)intern->ptr)) {
/* We know that we have a mysqli object, so this failure should be emitted */
zend_throw_error(NULL, "%s object is already closed", ZSTR_VAL(intern->zo.ce->name));
zend_throw_error(NULL, "%pS object is already closed", intern->zo.ce->name);
return NULL;
}
mysql = (MY_MYSQL *)(my_res->ptr);
Expand Down Expand Up @@ -761,7 +761,7 @@ void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int override_flags
ce = zend_standard_class_def;
}
if (UNEXPECTED(ce->ce_flags & (ZEND_ACC_INTERFACE|ZEND_ACC_TRAIT|ZEND_ACC_IMPLICIT_ABSTRACT_CLASS|ZEND_ACC_EXPLICIT_ABSTRACT_CLASS))) {
zend_throw_error(NULL, "Class %s cannot be instantiated", ZSTR_VAL(ce->name));
zend_throw_error(NULL, "Class %pS cannot be instantiated", ce->name);
RETURN_THROWS();
}
fetchtype = MYSQLI_ASSOC;
Expand Down Expand Up @@ -807,8 +807,8 @@ void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int override_flags
/* retval */ NULL, /* argc */ 0, /* params */ NULL, ctor_params);
} else if (ctor_params && zend_hash_num_elements(ctor_params) > 0) {
zend_argument_value_error(ERROR_ARG_POS(3),
"must be empty when the specified class (%s) does not have a constructor",
ZSTR_VAL(ce->name)
"must be empty when the specified class (%pS) does not have a constructor",
ce->name
);
}
}
Expand Down
6 changes: 3 additions & 3 deletions ext/mysqli/mysqli_nonapi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -656,12 +656,12 @@ static zend_result mysqlnd_zval_array_to_mysqlnd_array(zval *in_array, MYSQLND *
MYSQLI_RESOURCE *my_res;
mysqli_object *intern = Z_MYSQLI_P(elem);
if (!(my_res = (MYSQLI_RESOURCE *)intern->ptr)) {
zend_throw_error(NULL, "%s object is already closed", ZSTR_VAL(intern->zo.ce->name));
zend_throw_error(NULL, "%pS object is already closed", intern->zo.ce->name);
return FAILURE;
}
mysql = (MY_MYSQL*) my_res->ptr;
if (my_res->status < MYSQLI_STATUS_VALID) {
zend_throw_error(NULL, "%s object is not fully initialized", ZSTR_VAL(intern->zo.ce->name));
zend_throw_error(NULL, "%pS object is not fully initialized", intern->zo.ce->name);
return FAILURE;
}
(*out_array)[current++] = mysql->mysql;
Expand Down Expand Up @@ -690,7 +690,7 @@ static zend_result mysqlnd_zval_array_from_mysqlnd_array(MYSQLND **in_array, zva
MYSQLI_RESOURCE *my_res;
mysqli_object *intern = Z_MYSQLI_P(elem);
if (!(my_res = (MYSQLI_RESOURCE *)intern->ptr)) {
zend_throw_error(NULL, "%s object is already closed", ZSTR_VAL(intern->zo.ce->name));
zend_throw_error(NULL, "%pS object is already closed", intern->zo.ce->name);
return FAILURE;
}
mysql = (MY_MYSQL *) my_res->ptr;
Expand Down
6 changes: 3 additions & 3 deletions ext/mysqli/mysqli_prop.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
MYSQL *p; \
if (!obj->ptr || !(MY_MYSQL *)((MYSQLI_RESOURCE *)(obj->ptr))->ptr) { \
if (!quiet) { \
zend_throw_error(NULL, "%s object is already closed", ZSTR_VAL(obj->zo.ce->name)); \
zend_throw_error(NULL, "%pS object is already closed", obj->zo.ce->name); \
} \
return FAILURE; \
} else { \
Expand All @@ -47,7 +47,7 @@ if (!obj->ptr || !(MY_MYSQL *)((MYSQLI_RESOURCE *)(obj->ptr))->ptr) { \
MYSQL_RES *p; \
if (!obj->ptr) { \
if (!quiet) { \
zend_throw_error(NULL, "%s object is already closed", ZSTR_VAL(obj->zo.ce->name)); \
zend_throw_error(NULL, "%pS object is already closed", obj->zo.ce->name); \
} \
return FAILURE; \
} else { \
Expand All @@ -59,7 +59,7 @@ if (!obj->ptr) { \
MYSQL_STMT *p; \
if (!obj->ptr) { \
if (!quiet) { \
zend_throw_error(NULL, "%s object is already closed", ZSTR_VAL(obj->zo.ce->name)); \
zend_throw_error(NULL, "%pS object is already closed", obj->zo.ce->name); \
} \
return FAILURE; \
} else { \
Expand Down
6 changes: 3 additions & 3 deletions ext/mysqli/mysqli_warning.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ static zend_result mysqli_warning_message(mysqli_object *obj, zval *retval, bool

if (!obj->ptr || !((MYSQLI_RESOURCE *)(obj->ptr))->ptr) {
if (!quiet) {
zend_throw_error(NULL, "%s object is already closed", ZSTR_VAL(obj->zo.ce->name));
zend_throw_error(NULL, "%pS object is already closed", obj->zo.ce->name);
}

return FAILURE;
Expand All @@ -160,7 +160,7 @@ static zend_result mysqli_warning_sqlstate(mysqli_object *obj, zval *retval, boo

if (!obj->ptr || !((MYSQLI_RESOURCE *)(obj->ptr))->ptr) {
if (!quiet) {
zend_throw_error(NULL, "%s object is already closed", ZSTR_VAL(obj->zo.ce->name));
zend_throw_error(NULL, "%pS object is already closed", obj->zo.ce->name);
}

return FAILURE;
Expand All @@ -180,7 +180,7 @@ static zend_result mysqli_warning_errno(mysqli_object *obj, zval *retval, bool q

if (!obj->ptr || !((MYSQLI_RESOURCE *)(obj->ptr))->ptr) {
if (!quiet) {
zend_throw_error(NULL, "%s object is already closed", ZSTR_VAL(obj->zo.ce->name));
zend_throw_error(NULL, "%pS object is already closed", obj->zo.ce->name);
}

return FAILURE;
Expand Down
10 changes: 5 additions & 5 deletions ext/mysqli/php_mysqli_structs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,12 +160,12 @@ extern void php_mysqli_fetch_into_hash_aux(zval *return_value, MYSQL_RES * resul
MYSQLI_RESOURCE *my_res; \
mysqli_object *intern = Z_MYSQLI_P(__id); \
if (!(my_res = (MYSQLI_RESOURCE *)intern->ptr)) {\
zend_throw_error(NULL, "%s object is already closed", ZSTR_VAL(intern->zo.ce->name));\
zend_throw_error(NULL, "%pS object is already closed", intern->zo.ce->name);\
RETURN_THROWS();\
}\
__ptr = (__type)my_res->ptr; \
if (my_res->status < __check) { \
zend_throw_error(NULL, "%s object is not fully initialized", ZSTR_VAL(intern->zo.ce->name)); \
zend_throw_error(NULL, "%pS object is not fully initialized", intern->zo.ce->name); \
RETURN_THROWS();\
}\
}
Expand All @@ -174,12 +174,12 @@ extern void php_mysqli_fetch_into_hash_aux(zval *return_value, MYSQL_RES * resul
{ \
MYSQLI_RESOURCE *my_res; \
if (!(my_res = (MYSQLI_RESOURCE *)(__obj->ptr))) {\
zend_throw_error(NULL, "%s object is already closed", ZSTR_VAL(intern->zo.ce->name));\
zend_throw_error(NULL, "%pS object is already closed", intern->zo.ce->name);\
return;\
}\
__ptr = (__type)my_res->ptr; \
if (my_res->status < __check) { \
zend_throw_error(NULL, "%s object is not fully initialized", ZSTR_VAL(intern->zo.ce->name)); \
zend_throw_error(NULL, "%pS object is not fully initialized", intern->zo.ce->name); \
return;\
}\
}
Expand All @@ -188,7 +188,7 @@ extern void php_mysqli_fetch_into_hash_aux(zval *return_value, MYSQL_RES * resul
{ \
MYSQLI_FETCH_RESOURCE((__ptr), MY_MYSQL *, (__id), (__check)); \
if (!(__ptr)->mysql) { \
zend_throw_error(NULL, "%s object is not fully initialized", ZSTR_VAL(Z_OBJCE_P(__id)->name)); \
zend_throw_error(NULL, "%pS object is not fully initialized", Z_OBJCE_P(__id)->name); \
RETURN_THROWS(); \
} \
}
Expand Down
Loading