NDOize safeputs() and safeputchar()

[tcpdump] / print-syslog.c

diff --git a/print-syslog.c b/print-syslog.c
index f213cf2789b4ca57a110af30da4c88c20230988e..d332f67f5012f0937b29bebbe5b413d09ec2c320 100644 (file)
--- a/print-syslog.c
+++ b/print-syslog.c
@@ -14,11 +14,6 @@
  * 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
@@ -31,6 +26,8 @@ static const char rcsid[] _U_ =
 #include "interface.h"
 #include "extract.h"
 
+static const char tstr[] = "[|syslog]";
+
 /*
  * tokenlists and #defines taken from Ethereal - Network traffic analyzer
  * by Gerald Combs <[email protected]>
@@ -105,12 +102,12 @@ syslog_print(register const u_char *pptr, register u_int len)
             TCHECK2(*(pptr+msg_off), 1);
         }
         if (*(pptr+msg_off) != '>') {
-            printf("[|syslog]");
+            printf("%s", tstr);
             return;
         }
         msg_off++;
     } else {
-        printf("[|syslog]");
+        printf("%s", tstr);
         return;
     }
 
@@ -136,14 +133,14 @@ syslog_print(register const u_char *pptr, register u_int len)
     /* print the syslog text in verbose mode */
     for (; msg_off < len; msg_off++) {
         TCHECK2(*(pptr+msg_off), 1);
-        safeputchar(*(pptr+msg_off));
+        safeputchar(gndo, *(pptr + msg_off));
     }
 
     if (vflag > 1)
-        print_unknown_data(pptr,"\n\t",len);
+        print_unknown_data(gndo,pptr,"\n\t",len);
 
     return;
 
 trunc:
-        printf("[|syslog]");
+        printf("%s", tstr);
 }