Make 1-element arrays for fields that may repeat.

[tcpdump] / print-syslog.c

diff --git a/print-syslog.c b/print-syslog.c
index 0bad348c0478b71b1caf6421664568f5d6597a85..901c6f3a652c91667a6be0d202a108e8f1ba5e5b 100644 (file)
--- a/print-syslog.c
+++ b/print-syslog.c
@@ -78,7 +78,7 @@ static const struct tok syslog_facility_values[] = {
 
 void
 syslog_print(netdissect_options *ndo,
-             register const u_char *pptr, register u_int len)
+             const u_char *pptr, u_int len)
 {
     uint16_t msg_off = 0;
     uint16_t pri = 0;
@@ -91,17 +91,17 @@ syslog_print(netdissect_options *ndo,
      */
 
     ND_TCHECK_1(pptr);
-    if (*(pptr+msg_off) == '<') {
+    if (EXTRACT_U_1(pptr + msg_off) == '<') {
         msg_off++;
         ND_TCHECK_1(pptr + msg_off);
         while (msg_off <= SYSLOG_MAX_DIGITS &&
                EXTRACT_U_1(pptr + msg_off) >= '0' &&
                EXTRACT_U_1(pptr + msg_off) <= '9') {
-            pri = pri * 10 + (*(pptr+msg_off) - '0');
+            pri = pri * 10 + (EXTRACT_U_1(pptr + msg_off) - '0');
             msg_off++;
             ND_TCHECK_1(pptr + msg_off);
         }
-        if (*(pptr+msg_off) != '>') {
+        if (EXTRACT_U_1(pptr + msg_off) != '>') {
             ND_PRINT((ndo, "%s", tstr));
             return;
         }
@@ -133,7 +133,7 @@ syslog_print(netdissect_options *ndo,
     /* print the syslog text in verbose mode */
     for (; msg_off < len; msg_off++) {
         ND_TCHECK_1(pptr + msg_off);
-        safeputchar(ndo, *(pptr + msg_off));
+        safeputchar(ndo, EXTRACT_U_1(pptr + msg_off));
     }
 
     if (ndo->ndo_vflag > 1)