Skip to content

[%pS migration] Use %pS in ext/ldap #23156

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
+7 −7
Draft

[%pS migration] Use %pS in ext/ldap #23156

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
14 changes: 7 additions & 7 deletions ext/ldap/ldap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ static int php_ldap_control_from_array(LDAP *ld, LDAPControl** ctrl, const HashT
}
if (ldap_put_vrFilter(ber, ZSTR_VAL(tmpstring)) == -1) {
rc = -1;
php_error_docref(NULL, E_WARNING, "Failed to create control value: Bad ValuesReturnFilter: %s", ZSTR_VAL(tmpstring));
php_error_docref(NULL, E_WARNING, "Failed to create control value: Bad ValuesReturnFilter: %pS", tmpstring);
} else if (ber_flatten2(ber, &control_value, control_value_alloc) == -1) {
rc = -1;
}
Expand Down Expand Up @@ -701,7 +701,7 @@ static int php_ldap_control_from_array(LDAP *ld, LDAPControl** ctrl, const HashT
zend_string_release_ex(context_str, false);
}
} else {
zend_type_error("%s(): Control OID %s cannot be of type array", get_active_function_name(), ZSTR_VAL(control_oid));
zend_type_error("%s(): Control OID %pS cannot be of type array", get_active_function_name(), control_oid);
rc = -1;
}
}
Expand Down Expand Up @@ -2340,7 +2340,7 @@ static void php_ldap_do_modify(INTERNAL_FUNCTION_PARAMETERS, int oper, bool ext)
uint32_t num_values = zend_hash_num_elements(Z_ARRVAL_P(attribute_values));
if (num_values == 0) {
if (UNEXPECTED(oper == LDAP_MOD_ADD)) {
zend_argument_value_error(3, "attribute \"%s\" must be a non-empty list of attribute values", ZSTR_VAL(attribute));
zend_argument_value_error(3, "attribute \"%pS\" must be a non-empty list of attribute values", attribute);
RETVAL_FALSE;
goto cleanup;
}
Expand All @@ -2349,7 +2349,7 @@ static void php_ldap_do_modify(INTERNAL_FUNCTION_PARAMETERS, int oper, bool ext)
continue;
}
if (!php_ldap_is_numerically_indexed_array(Z_ARRVAL_P(attribute_values))) {
zend_argument_value_error(3, "attribute \"%s\" must be an array of attribute values with numeric keys", ZSTR_VAL(attribute));
zend_argument_value_error(3, "attribute \"%pS\" must be an array of attribute values with numeric keys", attribute);
RETVAL_FALSE;
goto cleanup;
}
Expand Down Expand Up @@ -4086,7 +4086,7 @@ static void php_ldap_exop(INTERNAL_FUNCTION_PARAMETERS, bool force_sync) {
retoid ? &lretoid : NULL,
&lretdata );
if (rc != LDAP_SUCCESS ) {
php_error_docref(NULL, E_WARNING, "Extended operation %s failed: %s (%d)", ZSTR_VAL(reqoid), ldap_err2string(rc), rc);
php_error_docref(NULL, E_WARNING, "Extended operation %pS failed: %s (%d)", reqoid, ldap_err2string(rc), rc);
RETVAL_FALSE;
goto cleanup;
}
Expand Down Expand Up @@ -4119,14 +4119,14 @@ static void php_ldap_exop(INTERNAL_FUNCTION_PARAMETERS, bool force_sync) {
NULL,
&msgid);
if (rc != LDAP_SUCCESS ) {
php_error_docref(NULL, E_WARNING, "Extended operation %s failed: %s (%d)", ZSTR_VAL(reqoid), ldap_err2string(rc), rc);
php_error_docref(NULL, E_WARNING, "Extended operation %pS failed: %s (%d)", reqoid, ldap_err2string(rc), rc);
RETVAL_FALSE;
goto cleanup;
}

rc = ldap_result(ld->link, msgid, 1 /* LDAP_MSG_ALL */, NULL, &ldap_res);
if (rc == -1) {
php_error_docref(NULL, E_WARNING, "Extended operation %s failed", ZSTR_VAL(reqoid));
php_error_docref(NULL, E_WARNING, "Extended operation %pS failed", reqoid);
RETVAL_FALSE;
goto cleanup;
}
Expand Down
Loading