remove redundant ND_TCHECK, let GET_ routines handle checks

[tcpdump] / print.c

diff --git a/print.c b/print.c
index ee64843e2c3fcf6fc9689968babd513d2ceaedfc..864e9ddde2920e50d2fa20e4b52844e2634d6876 100644 (file)
--- a/print.c
+++ b/print.c
@@ -398,12 +398,15 @@ pretty_print_packet(netdissect_options *ndo, const struct pcap_pkthdr *h,
 
        ndo->ndo_protocol = "";
        ndo->ndo_ll_hdr_len = 0;
-       if (setjmp(ndo->ndo_truncated) == 0) {
+       switch (setjmp(ndo->ndo_early_end)) {
+       case 0:
                /* Print the packet. */
                (ndo->ndo_if_printer)(ndo, h, sp);
-       } else {
+               break;
+       case ND_TRUNCATED:
                /* A printer quit because the packet was truncated; report it */
-               ND_PRINT(" [|%s]", ndo->ndo_protocol);
+               nd_print_trunc(ndo);
+               break;
        }
        hdrlen = ndo->ndo_ll_hdr_len;