LWRES: Use more EXTRACT_U_1() macro

[tcpdump] / print-lwres.c

diff --git a/print-lwres.c b/print-lwres.c
index 3712405251713fbb2263bcdfd84e32ec7437a913..0e0d1aa24df540b6f7575fad6107e7139194987b 100644 (file)
--- a/print-lwres.c
+++ b/print-lwres.c
@@ -204,8 +204,10 @@ lwres_printname(netdissect_options *ndo,
                goto trunc;
 
        ND_PRINT(" ");
-       for (i = 0; i < l; i++)
-               safeputchar(ndo, *p++);
+       for (i = 0; i < l; i++) {
+               safeputchar(ndo, EXTRACT_U_1(p));
+               p++;
+       }
        p++;    /* skip terminating \0 */
 
        return p - p0;
@@ -248,8 +250,10 @@ lwres_printbinlen(netdissect_options *ndo,
        if (p + 2 + l > ndo->ndo_snapend)
                goto trunc;
        p += 2;
-       for (i = 0; i < l; i++)
-               ND_PRINT("%02x", *p++);
+       for (i = 0; i < l; i++) {
+               ND_PRINT("%02x", EXTRACT_U_1(p));
+               p++;
+       }
        return p - p0;
 
   trunc:
@@ -287,8 +291,10 @@ lwres_printaddr(netdissect_options *ndo,
                break;
        default:
                ND_PRINT(" %u/", EXTRACT_BE_U_4(ap->family));
-               for (i = 0; i < l; i++)
-                       ND_PRINT("%02x", *p++);
+               for (i = 0; i < l; i++) {
+                       ND_PRINT("%02x", EXTRACT_U_1(p));
+                       p++;
+               }
        }
 
        return p - p0;