Skip to content

Commit dae2c37

Browse files
[%pS migration] Use %pS in ext/ldap
1 parent e2fa0c9 commit dae2c37

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

‎ext/ldap/ldap.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ static int php_ldap_control_from_array(LDAP *ld, LDAPControl** ctrl, const HashT
514514
}
515515
if (ldap_put_vrFilter(ber, ZSTR_VAL(tmpstring)) == -1) {
516516
rc = -1;
517-
php_error_docref(NULL, E_WARNING, "Failed to create control value: Bad ValuesReturnFilter: %s", ZSTR_VAL(tmpstring));
517+
php_error_docref(NULL, E_WARNING, "Failed to create control value: Bad ValuesReturnFilter: %pS", tmpstring);
518518
} else if (ber_flatten2(ber, &control_value, control_value_alloc) == -1) {
519519
rc = -1;
520520
}
@@ -700,7 +700,7 @@ static int php_ldap_control_from_array(LDAP *ld, LDAPControl** ctrl, const HashT
700700
zend_string_release_ex(context_str, false);
701701
}
702702
} else {
703-
zend_type_error("%s(): Control OID %s cannot be of type array", get_active_function_name(), ZSTR_VAL(control_oid));
703+
zend_type_error("%s(): Control OID %pS cannot be of type array", get_active_function_name(), control_oid);
704704
rc = -1;
705705
}
706706
}
@@ -2339,7 +2339,7 @@ static void php_ldap_do_modify(INTERNAL_FUNCTION_PARAMETERS, int oper, bool ext)
23392339
uint32_t num_values = zend_hash_num_elements(Z_ARRVAL_P(attribute_values));
23402340
if (num_values == 0) {
23412341
if (UNEXPECTED(oper == LDAP_MOD_ADD)) {
2342-
zend_argument_value_error(3, "attribute \"%s\" must be a non-empty list of attribute values", ZSTR_VAL(attribute));
2342+
zend_argument_value_error(3, "attribute \"%pS\" must be a non-empty list of attribute values", attribute);
23432343
RETVAL_FALSE;
23442344
goto cleanup;
23452345
}
@@ -2348,7 +2348,7 @@ static void php_ldap_do_modify(INTERNAL_FUNCTION_PARAMETERS, int oper, bool ext)
23482348
continue;
23492349
}
23502350
if (!php_ldap_is_numerically_indexed_array(Z_ARRVAL_P(attribute_values))) {
2351-
zend_argument_value_error(3, "attribute \"%s\" must be an array of attribute values with numeric keys", ZSTR_VAL(attribute));
2351+
zend_argument_value_error(3, "attribute \"%pS\" must be an array of attribute values with numeric keys", attribute);
23522352
RETVAL_FALSE;
23532353
goto cleanup;
23542354
}
@@ -4085,7 +4085,7 @@ static void php_ldap_exop(INTERNAL_FUNCTION_PARAMETERS, bool force_sync) {
40854085
retoid ? &lretoid : NULL,
40864086
&lretdata );
40874087
if (rc != LDAP_SUCCESS ) {
4088-
php_error_docref(NULL, E_WARNING, "Extended operation %s failed: %s (%d)", ZSTR_VAL(reqoid), ldap_err2string(rc), rc);
4088+
php_error_docref(NULL, E_WARNING, "Extended operation %pS failed: %s (%d)", reqoid, ldap_err2string(rc), rc);
40894089
RETVAL_FALSE;
40904090
goto cleanup;
40914091
}
@@ -4118,14 +4118,14 @@ static void php_ldap_exop(INTERNAL_FUNCTION_PARAMETERS, bool force_sync) {
41184118
NULL,
41194119
&msgid);
41204120
if (rc != LDAP_SUCCESS ) {
4121-
php_error_docref(NULL, E_WARNING, "Extended operation %s failed: %s (%d)", ZSTR_VAL(reqoid), ldap_err2string(rc), rc);
4121+
php_error_docref(NULL, E_WARNING, "Extended operation %pS failed: %s (%d)", reqoid, ldap_err2string(rc), rc);
41224122
RETVAL_FALSE;
41234123
goto cleanup;
41244124
}
41254125

41264126
rc = ldap_result(ld->link, msgid, 1 /* LDAP_MSG_ALL */, NULL, &ldap_res);
41274127
if (rc == -1) {
4128-
php_error_docref(NULL, E_WARNING, "Extended operation %s failed", ZSTR_VAL(reqoid));
4128+
php_error_docref(NULL, E_WARNING, "Extended operation %pS failed", reqoid);
41294129
RETVAL_FALSE;
41304130
goto cleanup;
41314131
}

0 commit comments

Comments
 (0)