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

[tcpdump] / print-atm.c

diff --git a/print-atm.c b/print-atm.c
index 03c77d45f95bb82d97edbeffa0b9a60dfb0b9145..9c4adbc12c040529a4335b04e469bf2e75c490b5 100644 (file)
--- a/print-atm.c
+++ b/print-atm.c
@@ -358,7 +358,7 @@ sig_print(netdissect_options *ndo,
                ND_PRINT((ndo, "Q.2931"));
                ND_TCHECK(p[MSG_TYPE_POS]);
                ND_PRINT((ndo, ":%s ",
-                   tok2str(msgtype2str, "msgtype#%d", p[MSG_TYPE_POS])));
+                   tok2str(msgtype2str, "msgtype#%d", EXTRACT_U_1(p + MSG_TYPE_POS))));
 
                /*
                 * The call reference comes before the message type,
@@ -370,7 +370,7 @@ sig_print(netdissect_options *ndo,
                ND_PRINT((ndo, "CALL_REF:0x%06x", call_ref));
        } else {
                /* SSCOP with some unknown protocol atop it */
-               ND_PRINT((ndo, "SSCOP, proto %d ", p[PROTO_POS]));
+               ND_PRINT((ndo, "SSCOP, proto %d ", EXTRACT_U_1(p + PROTO_POS)));
        }
        return;
 
@@ -538,7 +538,7 @@ oam_print (netdissect_options *ndo,
     }
 
     /* crc10 checksum verification */
-    ND_TCHECK2(*(p + OAM_CELLTYPE_FUNCTYPE_LEN + OAM_FUNCTION_SPECIFIC_LEN), 2);
+    ND_TCHECK_2(p + OAM_CELLTYPE_FUNCTYPE_LEN + OAM_FUNCTION_SPECIFIC_LEN);
     cksum = EXTRACT_BE_U_2(p + OAM_CELLTYPE_FUNCTYPE_LEN + OAM_FUNCTION_SPECIFIC_LEN)
         & OAM_CRC10_MASK;
     cksum_shouldbe = verify_crc10_cksum(0, p, OAM_PAYLOAD_LEN);