NDOize safeputs() and safeputchar()

[tcpdump] / print-syslog.c

diff --git a/print-syslog.c b/print-syslog.c
index 3685d62042a09d57334c36f532f0df839be45114..d332f67f5012f0937b29bebbe5b413d09ec2c320 100644 (file)
--- a/print-syslog.c
+++ b/print-syslog.c
@@ -14,11 +14,6 @@
  * FOR A PARTICULAR PURPOSE.
  */
 
  * FOR A PARTICULAR PURPOSE.
  */
 

-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-syslog.c,v 1.1 2004-10-29 11:42:53 hannes Exp $";
-#endif
-

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif


@@ -30,9 +25,10 @@ static const char rcsid[] _U_ =
 
 #include "interface.h"
 #include "extract.h"
 
 #include "interface.h"
 #include "extract.h"

-#include "addrtoname.h"

 
 

-/* 
+static const char tstr[] = "[|syslog]";
+
+/*

  * tokenlists and #defines taken from Ethereal - Network traffic analyzer
  * by Gerald Combs <[email protected]>
  */
  * tokenlists and #defines taken from Ethereal - Network traffic analyzer
  * by Gerald Combs <[email protected]>
  */


@@ -94,40 +90,30 @@ syslog_print(register const u_char *pptr, register u_int len)
      * severity and facility values
      */
 
      * severity and facility values
      */
 

-    if (!TTEST2(*pptr, 1))
-        goto trunc;
-
+    TCHECK2(*pptr, 1);

     if (*(pptr+msg_off) == '<') {
         msg_off++;
     if (*(pptr+msg_off) == '<') {
         msg_off++;

-
-        if (!TTEST2(*(pptr+msg_off), 1))
-            goto trunc;
-
+        TCHECK2(*(pptr+msg_off), 1);

         while ( *(pptr+msg_off) >= '0' &&
                 *(pptr+msg_off) <= '9' &&
                 msg_off <= SYSLOG_MAX_DIGITS) {
         while ( *(pptr+msg_off) >= '0' &&
                 *(pptr+msg_off) <= '9' &&
                 msg_off <= SYSLOG_MAX_DIGITS) {

-
-            if (!TTEST2(*(pptr+msg_off), 1))
-                goto trunc;
-

             pri = pri * 10 + (*(pptr+msg_off) - '0');
             msg_off++;
             pri = pri * 10 + (*(pptr+msg_off) - '0');
             msg_off++;

-
-            if (!TTEST2(*(pptr+msg_off), 1))
-                goto trunc;
-
-        if (*(pptr+msg_off) == '>')
-            msg_off++;
+            TCHECK2(*(pptr+msg_off), 1);

         }
         }

+        if (*(pptr+msg_off) != '>') {
+            printf("%s", tstr);
+            return;
+        }
+        msg_off++;

     } else {
     } else {

-        printf("[|syslog]");
+        printf("%s", tstr);

         return;
     }
 
     facility = (pri & SYSLOG_FACILITY_MASK) >> 3;
     severity = pri & SYSLOG_SEVERITY_MASK;
 
         return;
     }
 
     facility = (pri & SYSLOG_FACILITY_MASK) >> 3;
     severity = pri & SYSLOG_SEVERITY_MASK;
 

-    

     if (vflag < 1 )
     {
         printf("SYSLOG %s.%s, length: %u",
     if (vflag < 1 )
     {
         printf("SYSLOG %s.%s, length: %u",


@@ -136,7 +122,7 @@ syslog_print(register const u_char *pptr, register u_int len)
                len);
         return;
     }
                len);
         return;
     }

-       
+

     printf("SYSLOG, length: %u\n\tFacility %s (%u), Severity %s (%u)\n\tMsg: ",
            len,
            tok2str(syslog_facility_values, "unknown (%u)", facility),
     printf("SYSLOG, length: %u\n\tFacility %s (%u), Severity %s (%u)\n\tMsg: ",
            len,
            tok2str(syslog_facility_values, "unknown (%u)", facility),


@@ -146,18 +132,15 @@ syslog_print(register const u_char *pptr, register u_int len)
 
     /* print the syslog text in verbose mode */
     for (; msg_off < len; msg_off++) {
 
     /* print the syslog text in verbose mode */
     for (; msg_off < len; msg_off++) {

-        if (!TTEST2(*(pptr+msg_off), 1))
-            goto trunc;
-        safeputchar(*(pptr+msg_off));        
+        TCHECK2(*(pptr+msg_off), 1);
+        safeputchar(gndo, *(pptr + msg_off));

     }
 
     }
 

-    if (vflag > 1) {
-        if(!print_unknown_data(pptr,"\n\t",len))
-            return;
-    }
-    
+    if (vflag > 1)
+        print_unknown_data(gndo,pptr,"\n\t",len);
+

     return;
 
 trunc:
     return;
 
 trunc:

-        printf("[|syslog]");
+        printf("%s", tstr);

 }
 }