Use more ND_TCHECK_n()/ND_TTEST_n() macros

[tcpdump] / print-loopback.c

diff --git a/print-loopback.c b/print-loopback.c
index 10f69310c5521a850376381128c1af5a8ada5f9e..9ef77a97a1340820ee9a024618925f32529911bd 100644 (file)
--- a/print-loopback.c
+++ b/print-loopback.c
@@ -63,8 +63,8 @@ loopback_message_print(netdissect_options *ndo, const u_char *cp, const u_int le
        if (len < 2)
                goto invalid;
        /* function */
-       ND_TCHECK2(*cp, 2);
-       function = EXTRACT_LE_16BITS(cp);
+       ND_TCHECK_2(cp);
+       function = EXTRACT_LE_U_2(cp);
        cp += 2;
        ND_PRINT((ndo, ", %s", tok2str(fcode_str, " invalid (%u)", function)));
 
@@ -73,8 +73,8 @@ loopback_message_print(netdissect_options *ndo, const u_char *cp, const u_int le
                        if (len < 4)
                                goto invalid;
                        /* receipt number */
-                       ND_TCHECK2(*cp, 2);
-                       ND_PRINT((ndo, ", receipt number %u", EXTRACT_LE_16BITS(cp)));
+                       ND_TCHECK_2(cp);
+                       ND_PRINT((ndo, ", receipt number %u", EXTRACT_LE_U_2(cp)));
                        cp += 2;
                        /* data */
                        ND_PRINT((ndo, ", data (%u octets)", len - 4));
@@ -115,8 +115,8 @@ loopback_print(netdissect_options *ndo, const u_char *cp, const u_int len)
        if (len < 2)
                goto invalid;
        /* skipCount */
-       ND_TCHECK2(*cp, 2);
-       skipCount = EXTRACT_LE_16BITS(cp);
+       ND_TCHECK_2(cp);
+       skipCount = EXTRACT_LE_U_2(cp);
        cp += 2;
        ND_PRINT((ndo, ", skipCount %u", skipCount));
        if (skipCount % 8)