Commit 447304197cd for php
commit 447304197cdce1864f3887a83544753fcc084cab
Author: Daniel Scherzer <daniel.e.scherzer@gmail.com>
Date: Sat Nov 14 08:36:06 2026 -0800
[`%pS` migration] Use `%pS` in ext/snmp (#23169)
diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c
index f6b1b86eb54..82aa71ab3c2 100644
--- a/ext/snmp/snmp.c
+++ b/ext/snmp/snmp.c
@@ -757,7 +757,7 @@ static bool php_snmp_parse_oid(
objid_query->vars[objid_query->count].type = ptype;
idx_type++;
} else {
- zend_argument_value_error(type_arg_num, "must contain a type for object ID '%s'", ZSTR_VAL(tmp));
+ zend_argument_value_error(type_arg_num, "must contain a type for object ID '%pS'", tmp);
php_free_objid_query(objid_query, oid_ht, value_ht, st);
return false;
}
@@ -792,7 +792,7 @@ static bool php_snmp_parse_oid(
objid_query->vars[objid_query->count].value = ZSTR_VAL(tmp);
idx_value++;
} else {
- zend_argument_value_error(value_arg_num, "must contain a value for object ID '%s'", ZSTR_VAL(tmp));
+ zend_argument_value_error(value_arg_num, "must contain a value for object ID '%pS'", tmp);
php_free_objid_query(objid_query, oid_ht, value_ht, st);
return false;
}
@@ -957,7 +957,7 @@ static bool snmp_session_init(php_snmp_session **session_p, int version, zend_st
}
if (strlen(session->peername) == 0) {
- php_error_docref(NULL, E_WARNING, "Unknown failure while resolving '%s'", ZSTR_VAL(hostname));
+ php_error_docref(NULL, E_WARNING, "Unknown failure while resolving '%pS'", hostname);
php_network_freeaddresses(psal);
return false;
}
@@ -1130,7 +1130,7 @@ static ZEND_ATTRIBUTE_NONNULL bool snmp_session_gen_auth_key(struct snmp_session
if ((snmp_errno = generate_Ku(s->securityAuthProto, s->securityAuthProtoLen,
(uint8_t *) ZSTR_VAL(pass), ZSTR_LEN(pass),
s->securityAuthKey, &(s->securityAuthKeyLen)))) {
- php_error_docref(NULL, E_WARNING, "Error generating a key for authentication pass phrase '%s': %s", ZSTR_VAL(pass), snmp_api_errstring(snmp_errno));
+ php_error_docref(NULL, E_WARNING, "Error generating a key for authentication pass phrase '%pS': %s", pass, snmp_api_errstring(snmp_errno));
return false;
}
return true;
@@ -1146,7 +1146,7 @@ static ZEND_ATTRIBUTE_NONNULL bool snmp_session_gen_sec_key(struct snmp_session
if ((snmp_errno = generate_Ku(s->securityAuthProto, s->securityAuthProtoLen,
(uint8_t *)ZSTR_VAL(pass), ZSTR_LEN(pass),
s->securityPrivKey, &(s->securityPrivKeyLen)))) {
- php_error_docref(NULL, E_WARNING, "Error generating a key for privacy pass phrase '%s': %s", ZSTR_VAL(pass), snmp_api_errstring(snmp_errno));
+ php_error_docref(NULL, E_WARNING, "Error generating a key for privacy pass phrase '%pS': %s", pass, snmp_api_errstring(snmp_errno));
return false;
}
return true;
@@ -2123,7 +2123,7 @@ zval *php_snmp_write_property(zend_object *object, zend_string *name, zval *valu
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);
}