Avoid collison with error(), clean up code a bit.

Rename the variable to "error_status", as that's what it represents, and
as that doesn't collide with the error() function.  Don't set it and
then not use the resulting value.

diff --git a/print-snmp.c b/print-snmp.c
index 0636a1f9928ff17491f5f476a5b9558aadba5753..f348cd3bf08efd5d50ea6a815732eb7e705c5238 100644 (file)
--- a/print-snmp.c
+++ b/print-snmp.c
@@ -1297,7 +1297,7 @@ snmppdu_print(netdissect_options *ndo,
               u_short pduid, const u_char *np, u_int length)
 {
        struct be elem;
               u_short pduid, const u_char *np, u_int length)
 {
        struct be elem;

-       int count = 0, error;
+       int count = 0, error_status;

 
        /* reqId (Integer) */
        if ((count = asn1_parse(ndo, np, length, &elem)) < 0)
 
        /* reqId (Integer) */
        if ((count = asn1_parse(ndo, np, length, &elem)) < 0)


@@ -1320,7 +1320,7 @@ snmppdu_print(netdissect_options *ndo,
                asn1_print(ndo, &elem);
                return;
        }
                asn1_print(ndo, &elem);
                return;
        }

-       error = 0;
+       error_status = 0;

        if ((pduid == GETREQ || pduid == GETNEXTREQ || pduid == SETREQ
            || pduid == INFORMREQ || pduid == V2TRAP || pduid == REPORT)
            && elem.data.integer != 0) {
        if ((pduid == GETREQ || pduid == GETNEXTREQ || pduid == SETREQ
            || pduid == INFORMREQ || pduid == V2TRAP || pduid == REPORT)
            && elem.data.integer != 0) {


@@ -1332,7 +1332,7 @@ snmppdu_print(netdissect_options *ndo,
        } else if (elem.data.integer != 0) {
                char errbuf[20];
                ND_PRINT((ndo, " %s", DECODE_ErrorStatus(elem.data.integer)));
        } else if (elem.data.integer != 0) {
                char errbuf[20];
                ND_PRINT((ndo, " %s", DECODE_ErrorStatus(elem.data.integer)));

-               error = elem.data.integer;
+               error_status = elem.data.integer;

        }
        length -= count;
        np += count;
        }
        length -= count;
        np += count;


@@ -1352,15 +1352,12 @@ snmppdu_print(netdissect_options *ndo,
        else if (pduid == GETBULKREQ)
                ND_PRINT((ndo, " M=%d", elem.data.integer));
        else if (elem.data.integer != 0) {
        else if (pduid == GETBULKREQ)
                ND_PRINT((ndo, " M=%d", elem.data.integer));
        else if (elem.data.integer != 0) {

-               if (!error)
+               if (!error_status)

                        ND_PRINT((ndo, "[errorIndex(%d) w/o errorStatus]", elem.data.integer));
                        ND_PRINT((ndo, "[errorIndex(%d) w/o errorStatus]", elem.data.integer));

-               else {
+               else

                        ND_PRINT((ndo, "@%d", elem.data.integer));
                        ND_PRINT((ndo, "@%d", elem.data.integer));

-                       error = elem.data.integer;
-               }
-       } else if (error) {
+       } else if (error_status) {

                ND_PRINT((ndo, "[errorIndex==0]"));
                ND_PRINT((ndo, "[errorIndex==0]"));

-               error = 0;

        }
        length -= count;
        np += count;
        }
        length -= count;
        np += count;