From 30dcd18b906db266d6c0e63f15f1c40f68c9c4e8 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Tue, 3 Jan 2017 22:33:07 +0000 Subject: [PATCH] Swap parameters around with parse_syntax_strval(..) for consistency with other parse_* APIs in bsnmp* MFC after: 3 days Noted by: bz --- usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.c b/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.c index 752ddc0f0399..cc8cc33511cf 100644 --- a/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.c +++ b/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.c @@ -849,10 +849,9 @@ parse_pair_numoid_val(char *str, struct snmp_value *snmp_val) return (1); } -/* XXX-BZ aruments should be swapped. */ static int32_t -parse_syntax_strval(struct snmp_toolinfo *snmptoolctx, char *str, - struct snmp_object *object) +parse_syntax_strval(struct snmp_toolinfo *snmptoolctx, + struct snmp_object *object, char *str) { uint32_t len; enum snmp_syntax syn; @@ -924,7 +923,7 @@ parse_pair_stroid_val(struct snmp_toolinfo *snmptoolctx, return (-1); } - if (parse_syntax_strval(snmptoolctx, ptr + 1, obj) < 0) + if (parse_syntax_strval(snmptoolctx, obj, ptr + 1) < 0) return (-1); return (1);