Use more ND_TCHECK_n()/ND_TTEST_n() macros

[tcpdump] / print-loopback.c

diff --git a/print-loopback.c b/print-loopback.c
index ac7b17795986e9297fc8109800d4ac9d7a3dc58a..9ef77a97a1340820ee9a024618925f32529911bd 100644 (file)
--- a/print-loopback.c
+++ b/print-loopback.c
@@ -63,7 +63,7 @@ loopback_message_print(netdissect_options *ndo, const u_char *cp, const u_int le
        if (len < 2)
                goto invalid;
        /* function */
        if (len < 2)
                goto invalid;
        /* function */

-       ND_TCHECK2(*cp, 2);
+       ND_TCHECK_2(cp);

        function = EXTRACT_LE_U_2(cp);
        cp += 2;
        ND_PRINT((ndo, ", %s", tok2str(fcode_str, " invalid (%u)", function)));
        function = EXTRACT_LE_U_2(cp);
        cp += 2;
        ND_PRINT((ndo, ", %s", tok2str(fcode_str, " invalid (%u)", function)));


@@ -73,7 +73,7 @@ loopback_message_print(netdissect_options *ndo, const u_char *cp, const u_int le
                        if (len < 4)
                                goto invalid;
                        /* receipt number */
                        if (len < 4)
                                goto invalid;
                        /* receipt number */

-                       ND_TCHECK2(*cp, 2);
+                       ND_TCHECK_2(cp);

                        ND_PRINT((ndo, ", receipt number %u", EXTRACT_LE_U_2(cp)));
                        cp += 2;
                        /* data */
                        ND_PRINT((ndo, ", receipt number %u", EXTRACT_LE_U_2(cp)));
                        cp += 2;
                        /* data */


@@ -115,7 +115,7 @@ loopback_print(netdissect_options *ndo, const u_char *cp, const u_int len)
        if (len < 2)
                goto invalid;
        /* skipCount */
        if (len < 2)
                goto invalid;
        /* skipCount */

-       ND_TCHECK2(*cp, 2);
+       ND_TCHECK_2(cp);

        skipCount = EXTRACT_LE_U_2(cp);
        cp += 2;
        ND_PRINT((ndo, ", skipCount %u", skipCount));
        skipCount = EXTRACT_LE_U_2(cp);
        cp += 2;
        ND_PRINT((ndo, ", skipCount %u", skipCount));