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-vjc.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-vjc.c')
| -rw-r--r-- | print-vjc.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/print-vjc.c b/print-vjc.c index d52f6087..83033071 100644 --- a/print-vjc.c +++ b/print-vjc.c @@ -89,7 +89,6 @@ vjc_print(netdissect_options *ndo, const u_char *bp, u_short proto _U_) int i; ndo->ndo_protocol = "vjc"; - ND_TCHECK_1(bp); switch (GET_U_1(bp) & 0xf0) { case TYPE_IP: if (ndo->ndo_eflag) @@ -103,15 +102,12 @@ vjc_print(netdissect_options *ndo, const u_char *bp, u_short proto _U_) if (ndo->ndo_eflag) ND_PRINT("(vjc type=compressed TCP) "); for (i = 0; i < 8; i++) { - ND_TCHECK_1(bp + 1); if (GET_U_1(bp + 1) & (0x80 >> i)) ND_PRINT("%c", "?CI?SAWU"[i]); } if (GET_U_1(bp + 1)) ND_PRINT(" "); - ND_TCHECK_1(bp + 2); ND_PRINT("C=0x%02x ", GET_U_1(bp + 2)); - ND_TCHECK_2(bp + 3); ND_PRINT("sum=0x%04x ", GET_HE_U_2(bp + 3)); return -1; case TYPE_ERROR: @@ -123,7 +119,4 @@ vjc_print(netdissect_options *ndo, const u_char *bp, u_short proto _U_) ND_PRINT("(vjc type=0x%02x) ", GET_U_1(bp) & 0xf0); return -1; } - -trunc: - return -1; } |