X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/e729805021ba643522f94ff0c6b2df4706fc0cec..f5f55624f531d2a2a3a0029a831e4d4e27bc1e1c:/print-syslog.c diff --git a/print-syslog.c b/print-syslog.c index 3c27fb39..a3b56ce4 100644 --- a/print-syslog.c +++ b/print-syslog.c @@ -90,18 +90,15 @@ syslog_print(netdissect_options *ndo, * severity and facility values */ - ND_TCHECK_1(pptr); - if (EXTRACT_U_1(pptr + msg_off) == '<') { + if (GET_U_1(pptr) == '<') { msg_off++; - ND_TCHECK_1(pptr + msg_off); while (msg_off <= SYSLOG_MAX_DIGITS && - EXTRACT_U_1(pptr + msg_off) >= '0' && - EXTRACT_U_1(pptr + msg_off) <= '9') { - pri = pri * 10 + (EXTRACT_U_1(pptr + msg_off) - '0'); + 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 (EXTRACT_U_1(pptr + msg_off) != '>') { + if (GET_U_1(pptr + msg_off) != '>') { nd_print_trunc(ndo); return; } @@ -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, EXTRACT_U_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); }