From abc8c2d61c65757011d9d32abb01cd1e51232f3a Mon Sep 17 00:00:00 2001 From: Francois-Xavier Le Bail Date: Sat, 5 Sep 2020 19:40:32 +0200 Subject: Remove many (762) now redundant ND_TCHECK_n() calls 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. --- print-domain.c | 6 ------ 1 file changed, 6 deletions(-) (limited to 'print-domain.c') diff --git a/print-domain.c b/print-domain.c index 4523d67f..ad08073f 100644 --- a/print-domain.c +++ b/print-domain.c @@ -116,25 +116,19 @@ blabel_print(netdissect_options *ndo, /* print the bit string as a hex string */ ND_PRINT("\\[x"); for (bitp = cp + 1, b = bitlen; bitp < lim && b > 7; b -= 8, bitp++) { - ND_TCHECK_1(bitp); ND_PRINT("%02x", GET_U_1(bitp)); } if (b > 4) { - ND_TCHECK_1(bitp); tc = GET_U_1(bitp); bitp++; ND_PRINT("%02x", tc & (0xff << (8 - b))); } else if (b > 0) { - ND_TCHECK_1(bitp); tc = GET_U_1(bitp); bitp++; ND_PRINT("%1x", ((tc >> 4) & 0x0f) & (0x0f << (4 - b))); } ND_PRINT("/%u]", bitlen); return lim; -trunc: - ND_PRINT(".../%u]", bitlen); - return NULL; } static int -- cgit v1.2.1