From: Francois-Xavier Le Bail <devel.fx.lebail@orange.fr>
Date: Fri, 1 Dec 2017 21:35:28 +0000 (+0100)
Subject: Use more the EXTRACT_U_1() macro (40/n)
X-Git-Tag: tcpdump-4.99-bp~1687
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/d7b497cac78b6e22a66a6bae9bdec60a8044f67a

Use more the EXTRACT_U_1() macro (40/n)

In some macros and functions calls.
p[n], unsigned char *p.
---

diff --git a/print-isakmp.c b/print-isakmp.c
index 31af3f21..fa9fa239 100644
--- a/print-isakmp.c
+++ b/print-isakmp.c
@@ -2262,7 +2262,7 @@ ikev2_ID_print(netdissect_options *ndo, u_char tpay,
 		ND_TCHECK2(*typedata, idtype_len);
 		for(i=0; i<idtype_len; i++) {
 			if(ND_ISPRINT(EXTRACT_U_1(typedata + i))) {
-				ND_PRINT((ndo, "%c", typedata[i]));
+				ND_PRINT((ndo, "%c", EXTRACT_U_1(typedata + i)));
 			} else {
 				ND_PRINT((ndo, "."));
 			}
diff --git a/smbutil.c b/smbutil.c
index d7c70eeb..3493265f 100644
--- a/smbutil.c
+++ b/smbutil.c
@@ -282,7 +282,7 @@ smb_print_data(netdissect_options *ndo, const unsigned char *buf, int len)
     ND_PRINT((ndo, "[%03X] ", i));
     for (i = 0; i < len; /*nothing*/) {
         ND_TCHECK(buf[i]);
-	ND_PRINT((ndo, "%02X ", buf[i] & 0xff));
+	ND_PRINT((ndo, "%02X ", EXTRACT_U_1(buf + i) & 0xff));
 	i++;
 	if (i%8 == 0)
 	    ND_PRINT((ndo, " "));