From da20bc56d6100b5275d6f85c4a25bac1dab4e57e Mon Sep 17 00:00:00 2001 From: Francois-Xavier Le Bail Date: Wed, 22 Nov 2017 23:54:09 +0100 Subject: Rename EXTRACT_ macros Now all the macros have a name meaning a count in bytes. With _S_: signed, _U_: unsigned e.g.: EXTRACT_BE_32BITS -> EXTRACT_BE_U_4 EXTRACT_LE_32BITS -> EXTRACT_LE_U_4 ... EXTRACT_BE_INT32 -> EXTRACT_BE_S_4 and have: EXTRACT_8BITS -> EXTRACT_U_1 EXTRACT_INT8 -> EXTRACT_S_1 --- print-ppi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'print-ppi.c') diff --git a/print-ppi.c b/print-ppi.c index 72cd1b86..9cd5fc1e 100644 --- a/print-ppi.c +++ b/print-ppi.c @@ -34,8 +34,8 @@ ppi_header_print(netdissect_options *ndo, const u_char *bp, u_int length) hdr = (const ppi_header_t *)bp; - len = EXTRACT_LE_16BITS(&hdr->ppi_len); - dlt = EXTRACT_LE_32BITS(&hdr->ppi_dlt); + len = EXTRACT_LE_U_2(&hdr->ppi_len); + dlt = EXTRACT_LE_U_4(&hdr->ppi_dlt); dltname = pcap_datalink_val_to_name(dlt); if (!ndo->ndo_qflag) { @@ -68,7 +68,7 @@ ppi_print(netdissect_options *ndo, } hdr = (const ppi_header_t *)p; - len = EXTRACT_LE_16BITS(&hdr->ppi_len); + len = EXTRACT_LE_U_2(&hdr->ppi_len); if (caplen < len) { /* * If we don't have the entire PPI header, don't @@ -81,7 +81,7 @@ ppi_print(netdissect_options *ndo, ND_PRINT((ndo, "[|ppi]")); return (len); } - dlt = EXTRACT_LE_32BITS(&hdr->ppi_dlt); + dlt = EXTRACT_LE_U_4(&hdr->ppi_dlt); if (ndo->ndo_eflag) ppi_header_print(ndo, p, length); -- cgit v1.2.1