From: Francois-Xavier Le Bail <devel.fx.lebail@orange.fr>
Date: Fri, 1 Dec 2017 08:32:31 +0000 (+0100)
Subject: Use more the EXTRACT_U_1() macro (37/n)
X-Git-Tag: tcpdump-4.99-bp~1691
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/1ff54606670b48238857a93a8234356f433df093

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

In some snprintf() calls.
---

diff --git a/print-isoclns.c b/print-isoclns.c
index 8ec06584..e4bc6941 100644
--- a/print-isoclns.c
+++ b/print-isoclns.c
@@ -1666,17 +1666,19 @@ isis_print_id(const uint8_t *cp, int id_len)
     if (sysid_len > id_len)
         sysid_len = id_len;
     for (i = 1; i <= sysid_len; i++) {
-        snprintf(pos, sizeof(id) - (pos - id), "%02x", *cp++);
+        snprintf(pos, sizeof(id) - (pos - id), "%02x", EXTRACT_U_1(cp));
+	cp++;
 	pos += strlen(pos);
 	if (i == 2 || i == 4)
 	    *pos++ = '.';
 	}
     if (id_len >= NODE_ID_LEN) {
-        snprintf(pos, sizeof(id) - (pos - id), ".%02x", *cp++);
+        snprintf(pos, sizeof(id) - (pos - id), ".%02x", EXTRACT_U_1(cp));
+	cp++;
 	pos += strlen(pos);
     }
     if (id_len == LSP_ID_LEN)
-        snprintf(pos, sizeof(id) - (pos - id), "-%02x", *cp);
+        snprintf(pos, sizeof(id) - (pos - id), "-%02x", EXTRACT_U_1(cp));
     return (id);
 }