Use more the EXTRACT_U_1() macro (51/n)

[tcpdump] / print-syslog.c

diff --git a/print-syslog.c b/print-syslog.c
index 5e3cd4f70fe07ddab8f24eb746521b3416d40c1b..1610bd6d594e03c6b0738a04e258d7f672d4bb3c 100644 (file)
--- 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
@@ -14,14 +14,15 @@
  * FOR A PARTICULAR PURPOSE.
  */
 
-#define NETDISSECT_REWORKED
+/* \summary: Syslog protocol printer */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 
 static const char tstr[] = "[|syslog]";
@@ -89,18 +90,18 @@ syslog_print(netdissect_options *ndo,
      * severity and facility values
      */
 
-    ND_TCHECK2(*pptr, 1);
-    if (*(pptr+msg_off) == '<') {
+    ND_TCHECK_1(pptr);
+    if (EXTRACT_U_1(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) {
-            pri = pri * 10 + (*(pptr+msg_off) - '0');
+        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 + (EXTRACT_U_1(pptr + msg_off) - '0');
             msg_off++;
-            ND_TCHECK2(*(pptr + msg_off), 1);
+            ND_TCHECK_1(pptr + msg_off);
         }
-        if (*(pptr+msg_off) != '>') {
+        if (EXTRACT_U_1(pptr + msg_off) != '>') {
             ND_PRINT((ndo, "%s", tstr));
             return;
         }
@@ -131,8 +132,8 @@ syslog_print(netdissect_options *ndo,
 
     /* print the syslog text in verbose mode */
     for (; msg_off < len; msg_off++) {
-        ND_TCHECK2(*(pptr + msg_off), 1);
-        safeputchar(ndo, *(pptr + msg_off));
+        ND_TCHECK_1(pptr + msg_off);
+        safeputchar(ndo, EXTRACT_U_1(pptr + msg_off));
     }
 
     if (ndo->ndo_vflag > 1)