remove redundant ND_TCHECK, let GET_ routines handle checks

[tcpdump] / print-vtp.c

diff --git a/print-vtp.c b/print-vtp.c
index bcd0bab32b9aba93eb0052afca1fc23057b27e7a..e1b8377a213aeff846ef7b8b1a8e366bacbec4e6 100644 (file)
--- a/print-vtp.c
+++ b/print-vtp.c
@@ -184,7 +184,7 @@ vtp_print(netdissect_options *ndo,
        ND_TCHECK_8(tptr);
        ND_PRINT("\n\t  Config Rev %x, Updater %s",
               GET_BE_U_4(tptr),
-              ipaddr_string(ndo, tptr+4));
+              GET_IPADDR_STRING(tptr+4));
        tptr += 8;
        ND_TCHECK_LEN(tptr, VTP_UPDATE_TIMESTAMP_LEN);
        ND_PRINT(", Timestamp 0x%08x 0x%08x 0x%08x",
@@ -223,7 +223,6 @@ vtp_print(netdissect_options *ndo,
         *
         */
 
-       ND_TCHECK_4(tptr);
        ND_PRINT(", Config Rev %x", GET_BE_U_4(tptr));
 
        /*
@@ -244,7 +243,6 @@ vtp_print(netdissect_options *ndo,
        tptr += 4;
        while ((unsigned)(tptr - pptr) < length) {
 
-           ND_TCHECK_1(tptr);
            len = GET_U_1(tptr);
            if (len == 0)
                break;
@@ -378,7 +376,6 @@ vtp_print(netdissect_options *ndo,
         *
         */
 
-       ND_TCHECK_4(tptr);
        ND_PRINT("\n\tStart value: %u", GET_BE_U_4(tptr));
        break;