diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:52:33 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:52:33 +0000 |
| commit | 7ba700b7f6e5fb17d280e2b8a3ae28866777715f (patch) | |
| tree | 2f538ff3d975beabb6c371d999b1ee6e8b91cfb5 /print-ascii.c | |
| parent | Releasing progress-linux version 4.99.4-4~progress7.99u1. (diff) | |
| download | tcpdump-7ba700b7f6e5fb17d280e2b8a3ae28866777715f.tar.xz tcpdump-7ba700b7f6e5fb17d280e2b8a3ae28866777715f.zip | |
Merging upstream version 4.99.5.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'print-ascii.c')
| -rw-r--r-- | print-ascii.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/print-ascii.c b/print-ascii.c index a1dc4eb..f379c6c 100644 --- a/print-ascii.c +++ b/print-ascii.c @@ -38,9 +38,7 @@ /* \summary: ASCII packet dump printer */ -#ifdef HAVE_CONFIG_H #include <config.h> -#endif #include "netdissect-stdinc.h" @@ -67,7 +65,7 @@ ascii_print(netdissect_options *ndo, int truncated = FALSE; ndo->ndo_protocol = "ascii"; - caplength = (ndo->ndo_snapend > cp) ? ND_BYTES_AVAILABLE_AFTER(cp) : 0; + caplength = ND_BYTES_AVAILABLE_AFTER(cp); if (length > caplength) { length = caplength; truncated = TRUE; @@ -113,7 +111,7 @@ hex_and_ascii_print_with_offset(netdissect_options *ndo, const char *ident, char hexstuff[HEXDUMP_SHORTS_PER_LINE*HEXDUMP_HEXSTUFF_PER_SHORT+1], *hsp; char asciistuff[ASCII_LINELENGTH+1], *asp; - caplength = (ndo->ndo_snapend > cp) ? ND_BYTES_AVAILABLE_AFTER(cp) : 0; + caplength = ND_BYTES_AVAILABLE_AFTER(cp); if (length > caplength) { length = caplength; truncated = TRUE; @@ -181,7 +179,7 @@ hex_print_with_offset(netdissect_options *ndo, u_int nshorts; int truncated = FALSE; - caplength = (ndo->ndo_snapend > cp) ? ND_BYTES_AVAILABLE_AFTER(cp) : 0; + caplength = ND_BYTES_AVAILABLE_AFTER(cp); if (length > caplength) { length = caplength; truncated = TRUE; |