UDP: Add two missing return

[tcpdump] / print-snmp.c

diff --git a/print-snmp.c b/print-snmp.c
index 048e6989a7ece5e6830b4304a51b517a6fd3287b..6607f0515c1da4291b98ae55b4fd5750657ac8df 100644 (file)
--- a/print-snmp.c
+++ b/print-snmp.c
@@ -76,7 +76,6 @@
 
 #undef OPAQUE  /* defined in <wingdi.h> */
 
-static const char tstr[] = "[|snmp]";
 
 /*
  * Universal ASN.1 types
@@ -669,7 +668,7 @@ asn1_parse(netdissect_options *ndo,
        return elem->asnlen + hdr;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return -1;
 }
 
@@ -686,7 +685,7 @@ asn1_print_octets(netdissect_options *ndo, struct be *elem)
        return 0;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return -1;
 }
 
@@ -705,7 +704,7 @@ asn1_print_string(netdissect_options *ndo, struct be *elem)
        p = elem->data.str;
        if (printable) {
                ND_PRINT("\"");
-               if (fn_printn(ndo, p, asnlen, ndo->ndo_snapend)) {
+               if (nd_printn(ndo, p, asnlen, ndo->ndo_snapend)) {
                        ND_PRINT("\"");
                        goto trunc;
                }
@@ -719,7 +718,7 @@ asn1_print_string(netdissect_options *ndo, struct be *elem)
        return 0;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return -1;
 }
 
@@ -825,7 +824,7 @@ asn1_print(netdissect_options *ndo,
                p = (const u_char *)elem->data.raw;
                ND_TCHECK_LEN(p, asnlen);
                for (i = asnlen; i != 0; p++, i--) {
-                       ND_PRINT((i == asnlen-1) ? "%u" : ".%u", EXTRACT_U_1(p));
+                       ND_PRINT((i == asnlen) ? "%u" : ".%u", EXTRACT_U_1(p));
                }
                break;
 
@@ -850,7 +849,7 @@ asn1_print(netdissect_options *ndo,
        return 0;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return -1;
 }
 
@@ -949,7 +948,7 @@ smi_decode_oid(netdissect_options *ndo,
        return 0;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return -1;
 }
 
@@ -1884,6 +1883,7 @@ snmp_print(netdissect_options *ndo,
        int count = 0;
        int version = 0;
 
+       ndo->ndo_protocol = "snmp";
        ND_PRINT(" ");
 
        /* initial Sequence */