X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/49b23c5a9b0198bb382dcf43c458d46fcf2fa809..dcca20dd391f15c5c63d3b033fb7d7749bb1d8cd:/print-syslog.c

diff --git a/print-syslog.c b/print-syslog.c
index ff866762..0bad348c 100644
--- a/print-syslog.c
+++ b/print-syslog.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998-2004  Hannes Gredler <hannes@tcpdump.org>
+ * Copyright (c) 1998-2004  Hannes Gredler <hannes@gredler.at>
  *      The TCPDUMP project
  *
  * Redistribution and use in source and binary forms, with or without
@@ -90,16 +90,16 @@ syslog_print(netdissect_options *ndo,
      * severity and facility values
      */
 
-    ND_TCHECK2(*pptr, 1);
+    ND_TCHECK_1(pptr);
     if (*(pptr+msg_off) == '<') {
         msg_off++;
-        ND_TCHECK2(*(pptr + msg_off), 1);
-        while ( *(pptr+msg_off) >= '0' &&
-                *(pptr+msg_off) <= '9' &&
-                msg_off <= SYSLOG_MAX_DIGITS) {
+        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');
             msg_off++;
-            ND_TCHECK2(*(pptr + msg_off), 1);
+            ND_TCHECK_1(pptr + msg_off);
         }
         if (*(pptr+msg_off) != '>') {
             ND_PRINT((ndo, "%s", tstr));
@@ -132,7 +132,7 @@ syslog_print(netdissect_options *ndo,
 
     /* print the syslog text in verbose mode */
     for (; msg_off < len; msg_off++) {
-        ND_TCHECK2(*(pptr + msg_off), 1);
+        ND_TCHECK_1(pptr + msg_off);
         safeputchar(ndo, *(pptr + msg_off));
     }