Skip to content

[%pS migration] Use %pS in ext/snmp #23169

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

[%pS migration] Use %pS in ext/snmp #23169

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/snmp/snmp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -744,7 +744,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;
}
Expand Down Expand Up @@ -779,7 +779,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;
}
Expand Down Expand Up @@ -944,7 +944,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;
}
Expand Down Expand Up @@ -1089,7 +1089,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;
Expand All @@ -1105,7 +1105,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;
Expand Down Expand Up @@ -1835,7 +1835,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);
}

Expand Down
Loading