Use more the EXTRACT_U_1() macro (30/n)

diff --git a/print-eap.c b/print-eap.c
index bfc678f57d31d326f159013f4f5fe682b6673741..924157de8bbe3271fa6fb5920c2eb58b1262bcf9 100644 (file)
--- a/print-eap.c
+++ b/print-eap.c
@@ -243,7 +243,7 @@ eap_print(netdissect_options *ndo,
                        bittok2str(eap_tls_flags_values, "none", EXTRACT_U_1((tptr + 5))),
                        EXTRACT_U_1(tptr + 5)));
 
-                if (EAP_TLS_EXTRACT_BIT_L(*(tptr+5))) {
+                if (EAP_TLS_EXTRACT_BIT_L(EXTRACT_U_1(tptr + 5))) {
                     ND_TCHECK_4(tptr + 6);
                    ND_PRINT((ndo, " len %u", EXTRACT_BE_U_4(tptr + 6)));
                 }
@@ -257,7 +257,7 @@ eap_print(netdissect_options *ndo,
                        bittok2str(eap_tls_flags_values, "none", EXTRACT_U_1((tptr + 5))),
                        EXTRACT_U_1(tptr + 5)));
 
-                if (EAP_TLS_EXTRACT_BIT_L(*(tptr+5))) {
+                if (EAP_TLS_EXTRACT_BIT_L(EXTRACT_U_1(tptr + 5))) {
                     ND_TCHECK_4(tptr + 6);
                     ND_PRINT((ndo, " len %u", EXTRACT_BE_U_4(tptr + 6)));
                 }

diff --git a/print-udld.c b/print-udld.c
index 6833ed68c804ee4e3c78bcafa60e7c89832adcaa..748016c6336235bc14844cfb9b2038fa22f47475 100644 (file)
--- a/print-udld.c
+++ b/print-udld.c
@@ -106,10 +106,10 @@ udld_print (netdissect_options *ndo, const u_char *pptr, u_int length)
 
     ND_TCHECK2(*tptr, UDLD_HEADER_LEN);
 
-    code = UDLD_EXTRACT_OPCODE(*tptr);
+    code = UDLD_EXTRACT_OPCODE(EXTRACT_U_1(tptr));
 
     ND_PRINT((ndo, "UDLDv%u, Code %s (%x), Flags [%s] (0x%02x), length %u",
-           UDLD_EXTRACT_VERSION(*tptr),
+           UDLD_EXTRACT_VERSION(EXTRACT_U_1(tptr)),
            tok2str(udld_code_values, "Reserved", code),
            code,
            bittok2str(udld_flags_values, "none", EXTRACT_U_1((tptr + 1))),