diff options
| author | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2020-08-10 16:22:37 +0200 |
|---|---|---|
| committer | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2020-09-05 14:59:21 +0200 |
| commit | 929e4be621ebdcede37865a5767a175f083f9138 (patch) | |
| tree | bf6ecbc038696e66176b2d50e04e015767f23b3d /print-syslog.c | |
| parent | 54b5db3dde658894be730b15480f9b6e27b717a0 (diff) | |
| download | tcpdump-test-rc.tar.gz | |
Remove many (761) redundant ND_TCHECK_n() callstest-rc
ND_TCHECK_n(e), n in { 1, 2, 3, 4, 8 }.
They are redundant because they are followed by a GET_.*_n(e) call,
same n, same e, which do the bounds check.
Remove unused 'trunc' labels and most associated codes.
Update the outputs of some tests accordingly.
Diffstat (limited to 'print-syslog.c')
| -rw-r--r-- | print-syslog.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/print-syslog.c b/print-syslog.c index ede1d6ba..a3b56ce4 100644 --- a/print-syslog.c +++ b/print-syslog.c @@ -90,16 +90,13 @@ syslog_print(netdissect_options *ndo, * severity and facility values */ - ND_TCHECK_1(pptr); - if (GET_U_1(pptr + msg_off) == '<') { + if (GET_U_1(pptr) == '<') { msg_off++; - ND_TCHECK_1(pptr + msg_off); while (msg_off <= SYSLOG_MAX_DIGITS && GET_U_1(pptr + msg_off) >= '0' && GET_U_1(pptr + msg_off) <= '9') { pri = pri * 10 + (GET_U_1(pptr + msg_off) - '0'); msg_off++; - ND_TCHECK_1(pptr + msg_off); } if (GET_U_1(pptr + msg_off) != '>') { nd_print_trunc(ndo); @@ -132,15 +129,9 @@ syslog_print(netdissect_options *ndo, /* print the syslog text in verbose mode */ for (; msg_off < len; msg_off++) { - ND_TCHECK_1(pptr + msg_off); fn_print_char(ndo, GET_U_1(pptr + msg_off)); } if (ndo->ndo_vflag > 1) print_unknown_data(ndo, pptr, "\n\t", len); - - return; - -trunc: - nd_print_trunc(ndo); } |