Use pointer expressions like in most similar cases

[tcpdump] / print-snmp.c

diff --git a/print-snmp.c b/print-snmp.c
index 69b6a13f92a15c80dc80fb5d31dc1d7a5a88d547..99df847665bd0723346b022f9a38425f5cf777dd 100644 (file)
--- a/print-snmp.c
+++ b/print-snmp.c
@@ -72,6 +72,7 @@
 #endif
 
 #include "netdissect.h"
+#include "extract.h"
 
 #undef OPAQUE  /* defined in <wingdi.h> */
 
@@ -437,9 +438,9 @@ asn1_parse(netdissect_options *ndo,
         *  +---+---+---+---+---+---+---+---+
         *    7   6   5   4   3   2   1   0
         */
-       id = *p & ASN_ID_BITS;          /* lower 5 bits, range 00-1f */
+       id = EXTRACT_U_1(p) & ASN_ID_BITS;              /* lower 5 bits, range 00-1f */
 #ifdef notdef
-       form = (*p & 0xe0) >> 5;        /* move upper 3 bits to lower 3 */
+       form = (EXTRACT_U_1(p) & 0xe0) >> 5;    /* move upper 3 bits to lower 3 */
        class = form >> 1;              /* bits 7&6 -> bits 1&0, range 0-3 */
        form &= 0x1;                    /* bit 5 -> bit 0, range 0-1 */
 #else
@@ -480,7 +481,7 @@ asn1_parse(netdissect_options *ndo,
                        return -1;
                }
                ND_TCHECK(*p);
-               elem->id = id = (id << 7) | *p;
+               elem->id = id = (id << 7) | EXTRACT_U_1(p);
                --len;
                ++hdr;
                ++p;
@@ -500,8 +501,10 @@ asn1_parse(netdissect_options *ndo,
                        return -1;
                }
                ND_TCHECK2(*p, noct);
-               for (; noct-- > 0; len--, hdr++)
-                       elem->asnlen = (elem->asnlen << ASN_SHIFT8) | *p++;
+               for (; noct-- > 0; len--, hdr++) {
+                       elem->asnlen = (elem->asnlen << ASN_SHIFT8) | EXTRACT_U_1(p);
+                       p++;
+               }
        }
        if (len < elem->asnlen) {
                ND_PRINT((ndo, "[len%d<asnlen%u]", len, elem->asnlen));
@@ -519,6 +522,7 @@ asn1_parse(netdissect_options *ndo,
                ND_PRINT((ndo, "[id?%c/%s/%d]", *Form[form], Class[class].name, id));
                return -1;
        }
+       ND_TCHECK2(*p, elem->asnlen);
 
        switch (form) {
        case PRIMITIVE:
@@ -539,11 +543,10 @@ asn1_parse(netdissect_options *ndo,
                                        ND_PRINT((ndo, "[asnlen=0]"));
                                        return -1;
                                }
-                               ND_TCHECK2(*p, elem->asnlen);
                                if (*p & ASN_BIT8)      /* negative */
                                        data = -1;
                                for (i = elem->asnlen; i-- > 0; p++)
-                                       data = (data << ASN_SHIFT8) | *p;
+                                       data = (data << ASN_SHIFT8) | EXTRACT_U_1(p);
                                elem->data.integer = data;
                                break;
                        }
@@ -577,22 +580,20 @@ asn1_parse(netdissect_options *ndo,
                        case GAUGE:
                        case TIMETICKS: {
                                register uint32_t data;
-                               ND_TCHECK2(*p, elem->asnlen);
                                elem->type = BE_UNS;
                                data = 0;
                                for (i = elem->asnlen; i-- > 0; p++)
-                                       data = (data << 8) + *p;
+                                       data = (data << 8) + EXTRACT_U_1(p);
                                elem->data.uns = data;
                                break;
                        }
 
                        case COUNTER64: {
                                register uint64_t data64;
-                               ND_TCHECK2(*p, elem->asnlen);
                                elem->type = BE_UNS64;
                                data64 = 0;
                                for (i = elem->asnlen; i-- > 0; p++)
-                                       data64 = (data64 << 8) + *p;
+                                       data64 = (data64 << 8) + EXTRACT_U_1(p);
                                elem->data.uns64 = data64;
                                break;
                        }
@@ -627,7 +628,6 @@ asn1_parse(netdissect_options *ndo,
 
                default:
                        ND_PRINT((ndo, "[P/%s/%s]", Class[class].name, Class[class].Id[id]));
-                       ND_TCHECK2(*p, elem->asnlen);
                        elem->type = BE_OCTET;
                        elem->data.raw = (const uint8_t *)p;
                        break;