Use more ND_TCHECK_n()/ND_TTEST_n() macros

[tcpdump] / print-syslog.c

diff --git a/print-syslog.c b/print-syslog.c
index 4f613f0ac0673f2a6e9e9f9cc607e5e3e7bbb8df..e69d58cd6533ae4040dc52f325e9e359dbed3e08 100644 (file)
--- a/print-syslog.c
+++ b/print-syslog.c
@@ -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);
+        ND_TCHECK_1(pptr + msg_off);
         while (msg_off <= SYSLOG_MAX_DIGITS &&
                *(pptr+msg_off) >= '0' &&
                *(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));
     }