Makefile.in: don't remove configure and config.h.in in make distclean.

[tcpdump] / print-tftp.c

diff --git a/print-tftp.c b/print-tftp.c
index b6f9107e7c53c2348691ce71bb1883208915c36c..39fc6964b8a26eac38b2a155ce892d0127a0de25 100644 (file)
--- a/print-tftp.c
+++ b/print-tftp.c
@@ -27,8 +27,6 @@
 
 #include "netdissect-stdinc.h"
 
-#include <string.h>
-
 #include "netdissect.h"
 #include "extract.h"
 
@@ -104,7 +102,6 @@ tftp_print(netdissect_options *ndo,
        /* Print tftp request type */
        if (length < 2)
                goto trunc;
-       ND_TCHECK_2(bp);
        opcode = GET_BE_U_2(bp);
        cp = tok2str(op2str, "tftp-#%u", opcode);
        ND_PRINT(", %s", cp);
@@ -142,7 +139,6 @@ tftp_print(netdissect_options *ndo,
 
                /* Print options, if any */
                while (length != 0) {
-                       ND_TCHECK_1(bp);
                        if (GET_U_1(bp) != '\0')
                                ND_PRINT(" ");
                        ui = nd_printztn(ndo, bp, length, ndo->ndo_snapend);
@@ -156,7 +152,6 @@ tftp_print(netdissect_options *ndo,
        case OACK:
                /* Print options */
                while (length != 0) {
-                       ND_TCHECK_1(bp);
                        if (GET_U_1(bp) != '\0')
                                ND_PRINT(" ");
                        ui = nd_printztn(ndo, bp, length, ndo->ndo_snapend);
@@ -171,7 +166,6 @@ tftp_print(netdissect_options *ndo,
        case DATA:
                if (length < 2)
                        goto trunc;     /* no block number */
-               ND_TCHECK_2(bp);
                ND_PRINT(" block %u", GET_BE_U_2(bp));
                break;
 
@@ -179,7 +173,6 @@ tftp_print(netdissect_options *ndo,
                /* Print error code string */
                if (length < 2)
                        goto trunc;     /* no error code */
-               ND_TCHECK_2(bp);
                ND_PRINT(" %s", tok2str(err2str, "tftp-err-#%u \"",
                                       GET_BE_U_2(bp)));
                bp += 2;
@@ -202,5 +195,4 @@ tftp_print(netdissect_options *ndo,
        return;
 trunc:
        nd_print_trunc(ndo);
-       return;
 }