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

1 files changed, 17 insertions, 17 deletions

diff --git a/print-rip.c b/print-rip.c
index 43f681b8..4a289af5 100644
--- a/print-rip.c
+++ b/print-rip.c
@@ -100,15 +100,15 @@ rip_entry_print_v1(netdissect_options *ndo,
 	register u_short family;
 
 	/* RFC 1058 */
-	family = EXTRACT_BE_16BITS(&ni->rip_family);
+	family = EXTRACT_BE_U_2(&ni->rip_family);
 	if (family != BSD_AFNUM_INET && family != 0) {
 		ND_PRINT((ndo, "\n\t AFI %s, ", tok2str(bsd_af_values, "Unknown (%u)", family)));
 		print_unknown_data(ndo, (const uint8_t *)&ni->rip_family, "\n\t  ", RIP_ROUTELEN);
 		return;
 	}
-	if (EXTRACT_BE_16BITS(&ni->rip_tag) ||
-	    EXTRACT_BE_32BITS(&ni->rip_dest_mask) ||
-	    EXTRACT_BE_32BITS(&ni->rip_router)) {
+	if (EXTRACT_BE_U_2(&ni->rip_tag) ||
+	    EXTRACT_BE_U_4(&ni->rip_dest_mask) ||
+	    EXTRACT_BE_U_4(&ni->rip_router)) {
 		/* MBZ fields not zero */
                 print_unknown_data(ndo, (const uint8_t *)&ni->rip_family, "\n\t  ", RIP_ROUTELEN);
 		return;
@@ -116,12 +116,12 @@ rip_entry_print_v1(netdissect_options *ndo,
 	if (family == 0) {
 		ND_PRINT((ndo, "\n\t  AFI 0, %s, metric: %u",
 			ipaddr_string(ndo, &ni->rip_dest),
-			EXTRACT_BE_32BITS(&ni->rip_metric)));
+			EXTRACT_BE_U_4(&ni->rip_metric)));
 		return;
 	} /* BSD_AFNUM_INET */
 	ND_PRINT((ndo, "\n\t  %s, metric: %u",
                ipaddr_string(ndo, &ni->rip_dest),
-	       EXTRACT_BE_32BITS(&ni->rip_metric)));
+	       EXTRACT_BE_U_4(&ni->rip_metric)));
 }
 
 static unsigned
@@ -130,9 +130,9 @@ rip_entry_print_v2(netdissect_options *ndo,
 {
 	register u_short family;
 
-	family = EXTRACT_BE_16BITS(&ni->rip_family);
+	family = EXTRACT_BE_U_2(&ni->rip_family);
 	if (family == 0xFFFF) { /* variable-sized authentication structures */
-		uint16_t auth_type = EXTRACT_BE_16BITS(&ni->rip_tag);
+		uint16_t auth_type = EXTRACT_BE_U_2(&ni->rip_tag);
 		if (auth_type == 2) {
 			register const u_char *p = (const u_char *)&ni->rip_dest;
 			u_int i = 0;
@@ -141,19 +141,19 @@ rip_entry_print_v2(netdissect_options *ndo,
 				ND_PRINT((ndo, "%c", ND_ISPRINT(*p) ? *p : '.'));
 		} else if (auth_type == 3) {
 			ND_PRINT((ndo, "\n\t  Auth header:"));
-			ND_PRINT((ndo, " Packet Len %u,", EXTRACT_BE_16BITS((const uint8_t *)ni + 4)));
+			ND_PRINT((ndo, " Packet Len %u,", EXTRACT_BE_U_2((const uint8_t *)ni + 4)));
 			ND_PRINT((ndo, " Key-ID %u,", *((const uint8_t *)ni + 6)));
 			ND_PRINT((ndo, " Auth Data Len %u,", *((const uint8_t *)ni + 7)));
-			ND_PRINT((ndo, " SeqNo %u,", EXTRACT_BE_32BITS(&ni->rip_dest_mask)));
-			ND_PRINT((ndo, " MBZ %u,", EXTRACT_BE_32BITS(&ni->rip_router)));
-			ND_PRINT((ndo, " MBZ %u", EXTRACT_BE_32BITS(&ni->rip_metric)));
+			ND_PRINT((ndo, " SeqNo %u,", EXTRACT_BE_U_4(&ni->rip_dest_mask)));
+			ND_PRINT((ndo, " MBZ %u,", EXTRACT_BE_U_4(&ni->rip_router)));
+			ND_PRINT((ndo, " MBZ %u", EXTRACT_BE_U_4(&ni->rip_metric)));
 		} else if (auth_type == 1) {
 			ND_PRINT((ndo, "\n\t  Auth trailer:"));
 			print_unknown_data(ndo, (const uint8_t *)&ni->rip_dest, "\n\t  ", remaining);
 			return remaining; /* AT spans till the packet end */
 		} else {
 			ND_PRINT((ndo, "\n\t  Unknown (%u) Authentication data:",
-			       EXTRACT_BE_16BITS(&ni->rip_tag)));
+			       EXTRACT_BE_U_2(&ni->rip_tag)));
 			print_unknown_data(ndo, (const uint8_t *)&ni->rip_dest, "\n\t  ", remaining);
 		}
 	} else if (family != BSD_AFNUM_INET && family != 0) {
@@ -163,10 +163,10 @@ rip_entry_print_v2(netdissect_options *ndo,
 		ND_PRINT((ndo, "\n\t  AFI %s, %15s/%-2d, tag 0x%04x, metric: %u, next-hop: ",
                        tok2str(bsd_af_values, "%u", family),
                        ipaddr_string(ndo, &ni->rip_dest),
-		       mask2plen(EXTRACT_BE_32BITS(&ni->rip_dest_mask)),
-		       EXTRACT_BE_16BITS(&ni->rip_tag),
-		       EXTRACT_BE_32BITS(&ni->rip_metric)));
-		if (EXTRACT_BE_32BITS(&ni->rip_router))
+		       mask2plen(EXTRACT_BE_U_4(&ni->rip_dest_mask)),
+		       EXTRACT_BE_U_2(&ni->rip_tag),
+		       EXTRACT_BE_U_4(&ni->rip_metric)));
+		if (EXTRACT_BE_U_4(&ni->rip_router))
 			ND_PRINT((ndo, "%s", ipaddr_string(ndo, &ni->rip_router)));
 		else
 			ND_PRINT((ndo, "self"));