Use more the EXTRACT_8BITS() macro to fetch a one-byte value (17/n)

[tcpdump] / print-syslog.c

diff --git a/print-syslog.c b/print-syslog.c
index 08407d53596559ffd1317c9339b7399834fd9056..4f613f0ac0673f2a6e9e9f9cc607e5e3e7bbb8df 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,6 +14,8 @@
  * FOR A PARTICULAR PURPOSE.
  */
 
+/* \summary: Syslog protocol printer */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -92,9 +94,9 @@ syslog_print(netdissect_options *ndo,
     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) {
+        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);