Skip to content

[%pS migration] Use %pS in ext/dba #23151

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
Draft

[%pS migration] Use %pS in ext/dba #23151

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
8 changes: 4 additions & 4 deletions ext/dba/dba.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ static zend_string* php_dba_make_key(const HashTable *key)
return name_str;
}

zend_string *key_str = zend_strpprintf(0, "[%s]%s", ZSTR_VAL(group_str), ZSTR_VAL(name_str));
zend_string *key_str = zend_strpprintf(0, "[%pS]%pS", group_str, name_str);
zend_string_release_ex(group_str, false);
zend_string_release_ex(name_str, false);
return key_str;
Expand Down Expand Up @@ -364,7 +364,7 @@ static ZEND_INI_MH(OnUpdateDefaultHandler)
for (hptr = handler; hptr->name && strcasecmp(hptr->name, ZSTR_VAL(new_value)); hptr++);

if (!hptr->name) {
php_error_docref(NULL, E_WARNING, "No such handler: %s", ZSTR_VAL(new_value));
php_error_docref(NULL, E_WARNING, "No such handler: %pS", new_value);
return FAILURE;
}
DBA_G(default_hptr) = hptr;
Expand Down Expand Up @@ -575,7 +575,7 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, bool persistent)
}

zend_string *resource_key = zend_strpprintf(0,
"dba_%d_%u_%s_%s_%s", persistent, persistent ? 0 : DBA_G(connection_counter)++, ZSTR_VAL(path), ZSTR_VAL(mode), handler_str ? ZSTR_VAL(handler_str) : ""
"dba_%d_%u_%pS_%pS_%s", persistent, persistent ? 0 : DBA_G(connection_counter)++, path, mode, handler_str ? ZSTR_VAL(handler_str) : ""
);

if (persistent) {
Expand Down Expand Up @@ -618,7 +618,7 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, bool persistent)
for (hptr = handler; hptr->name && strcasecmp(hptr->name, ZSTR_VAL(handler_str)); hptr++);

if (!hptr->name) {
php_error_docref(NULL, E_WARNING, "Handler \"%s\" is not available", ZSTR_VAL(handler_str));
php_error_docref(NULL, E_WARNING, "Handler \"%pS\" is not available", handler_str);
zend_string_release_ex(resource_key, /* persistent */ false);
RETURN_FALSE;
}
Expand Down
Loading