Use more the EXTRACT_8BITS() macro to fetch a one-byte value (21/n)

In safeputchar() calls, *p++.

diff --git a/print-ppp.c b/print-ppp.c
index 7203d12e8474198f9c362a2d389d65ce9a77549e..163de1dfddd8c7953f2cd7e5936216673e5ffee6 100644 (file)
--- a/print-ppp.c
+++ b/print-ppp.c
@@ -889,7 +889,8 @@ handle_chap(netdissect_options *ndo,
                ND_PRINT((ndo, ", Name "));
                for (i = 0; i < name_size; i++) {
                        ND_TCHECK(*p);
-                       safeputchar(ndo, *p++);
+                       safeputchar(ndo, EXTRACT_8BITS(p));
+                       p++;
                }
                break;
        case CHAP_SUCC:
@@ -898,7 +899,8 @@ handle_chap(netdissect_options *ndo,
                ND_PRINT((ndo, ", Msg "));
                for (i = 0; i< msg_size; i++) {
                        ND_TCHECK(*p);
-                       safeputchar(ndo, *p++);
+                       safeputchar(ndo, EXTRACT_8BITS(p));
+                       p++;
                }
                break;
        }
@@ -968,7 +970,8 @@ handle_pap(netdissect_options *ndo,
                ND_PRINT((ndo, ", Peer "));
                for (i = 0; i < peerid_len; i++) {
                        ND_TCHECK(*p);
-                       safeputchar(ndo, *p++);
+                       safeputchar(ndo, EXTRACT_8BITS(p));
+                       p++;
                }
 
                if (length - (p - p0) < 1)
@@ -981,7 +984,8 @@ handle_pap(netdissect_options *ndo,
                ND_PRINT((ndo, ", Name "));
                for (i = 0; i < passwd_len; i++) {
                        ND_TCHECK(*p);
-                       safeputchar(ndo, *p++);
+                       safeputchar(ndo, EXTRACT_8BITS(p));
+                       p++;
                }
                break;
        case PAP_AACK:
@@ -1003,7 +1007,8 @@ handle_pap(netdissect_options *ndo,
                ND_PRINT((ndo, ", Msg "));
                for (i = 0; i< msg_len; i++) {
                        ND_TCHECK(*p);
-                       safeputchar(ndo, *p++);
+                       safeputchar(ndo, EXTRACT_8BITS(p));
+                       p++;
                }
                break;
        }