Use more the EXTRACT_8BITS() macro to fetch a one-byte value (19/n)

Assignment, *p++ -> EXTRACT_8BITS(p); p++;
Assignment, *(p++) -> EXTRACT_8BITS(p); p++;

Partial list.

diff --git a/print-egp.c b/print-egp.c
index 29f653b38a74982c43b76f19a2642da40a8d52af..51d78599abb2b738ec3fe5931c7aed27dd337bee 100644 (file)
--- a/print-egp.c
+++ b/print-egp.c
@@ -166,7 +166,8 @@ egpnrprint(netdissect_options *ndo,
                switch (netlen) {
 
                case 1:
-                       addr = *cp++;
+                       addr = EXTRACT_8BITS(cp);
+                       cp++;
                        /* fall through */
                case 2:
                        addr = (addr << 8) | *cp++;
@@ -179,7 +180,8 @@ egpnrprint(netdissect_options *ndo,
                if (length < 1)
                        goto trunc;
                ND_TCHECK2(cp[0], 1);
-               distances = *cp++;
+               distances = EXTRACT_8BITS(cp);
+               cp++;
                length--;
                ND_PRINT((ndo, " %s %s ",
                       gateways < (int)egp->egp_intgw ? "int" : "ext",
@@ -193,7 +195,8 @@ egpnrprint(netdissect_options *ndo,
                        ND_TCHECK2(cp[0], 2);
                        ND_PRINT((ndo, "%sd%d:", comma, (int)*cp++));
                        comma = ", ";
-                       networks = *cp++;
+                       networks = EXTRACT_8BITS(cp);
+                       cp++;
                        length -= 2;
                        while (--networks >= 0) {
                                /* Pickup network number */

diff --git a/print-juniper.c b/print-juniper.c
index d9c45200dffd5a52e9170647411b1b989b08e68e..cb08dc0f86cdcf19aac40633cc92053d46f2fa52 100644 (file)
--- a/print-juniper.c
+++ b/print-juniper.c
@@ -1234,8 +1234,10 @@ juniper_parse_header(netdissect_options *ndo,
 
         ND_TCHECK2(tptr[0], jnx_ext_len);
         while (jnx_ext_len > JUNIPER_EXT_TLV_OVERHEAD) {
-            tlv_type = *(tptr++);
-            tlv_len = *(tptr++);
+            tlv_type = EXTRACT_8BITS(tptr);
+            tptr++;
+            tlv_len = EXTRACT_8BITS(tptr);
+            tptr++;
             tlv_value = 0;
 
             /* sanity checks */