CI: Add warning exemptions for Sun C (suncc-5.14) on Solaris 10

[tcpdump] / print-ascii.c

diff --git a/print-ascii.c b/print-ascii.c
index 237cf636caa21bc9f33b9c81948f860bbef19a38..f504d2f7f0cfb0305b3d9d51a07447f4a8694b38 100644 (file)
--- a/print-ascii.c
+++ b/print-ascii.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: print-ascii.c,v 1.1 1999/09/30 14:49:12 sjg Exp $      */
+/*     $NetBSD: print-ascii.c,v 1.1 1999/09/30 14:49:12 sjg Exp $      */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -38,9 +38,7 @@
 
 /* \summary: ASCII packet dump printer */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "netdissect-stdinc.h"
 
@@ -58,21 +56,22 @@
 #define HEXDUMP_HEXSTUFF_PER_LINE \
                (HEXDUMP_HEXSTUFF_PER_SHORT * HEXDUMP_SHORTS_PER_LINE)
 
-static void hex_and_ascii_print_with_offset(netdissect_options *, const char *, const u_char *, u_int, u_int);
-
 void
 ascii_print(netdissect_options *ndo,
             const u_char *cp, u_int length)
 {
        u_int caplength;
        u_char s;
+       int truncated = FALSE;
 
        ndo->ndo_protocol = "ascii";
-       caplength = (ndo->ndo_snapend > cp) ? ND_BYTES_AVAILABLE_AFTER(cp) : 0;
-       if (length > caplength)
+       caplength = ND_BYTES_AVAILABLE_AFTER(cp);
+       if (length > caplength) {
                length = caplength;
+               truncated = TRUE;
+       }
        ND_PRINT("\n");
-       while (length > 0) {
+       while (length != 0) {
                s = GET_U_1(cp);
                cp++;
                length--;
@@ -96,22 +95,27 @@ ascii_print(netdissect_options *ndo,
                                ND_PRINT("%c", s);
                }
        }
+       if (truncated)
+               nd_trunc_longjmp(ndo);
 }
 
 static void
-hex_and_ascii_print_with_offset(netdissect_options *ndo, const char *ident,
-    const u_char *cp, u_int length, u_int oset)
+hex_and_ascii_print_with_offset(netdissect_options *ndo, const char *indent,
+                               const u_char *cp, u_int length, u_int offset)
 {
        u_int caplength;
        u_int i;
        u_int s1, s2;
        u_int nshorts;
+       int truncated = FALSE;
        char hexstuff[HEXDUMP_SHORTS_PER_LINE*HEXDUMP_HEXSTUFF_PER_SHORT+1], *hsp;
        char asciistuff[ASCII_LINELENGTH+1], *asp;
 
-       caplength = (ndo->ndo_snapend > cp) ? ND_BYTES_AVAILABLE_AFTER(cp) : 0;
-       if (length > caplength)
+       caplength = ND_BYTES_AVAILABLE_AFTER(cp);
+       if (length > caplength) {
                length = caplength;
+               truncated = TRUE;
+       }
        nshorts = length / sizeof(u_short);
        i = 0;
        hsp = hexstuff; asp = asciistuff;
@@ -129,10 +133,10 @@ hex_and_ascii_print_with_offset(netdissect_options *ndo, const char *ident,
                if (i >= HEXDUMP_SHORTS_PER_LINE) {
                        *hsp = *asp = '\0';
                        ND_PRINT("%s0x%04x: %-*s  %s",
-                           ident, oset, HEXDUMP_HEXSTUFF_PER_LINE,
+                           indent, offset, HEXDUMP_HEXSTUFF_PER_LINE,
                            hexstuff, asciistuff);
                        i = 0; hsp = hexstuff; asp = asciistuff;
-                       oset += HEXDUMP_BYTES_PER_LINE;
+                       offset += HEXDUMP_BYTES_PER_LINE;
                }
                nshorts--;
        }
@@ -148,16 +152,18 @@ hex_and_ascii_print_with_offset(netdissect_options *ndo, const char *ident,
        if (i > 0) {
                *hsp = *asp = '\0';
                ND_PRINT("%s0x%04x: %-*s  %s",
-                    ident, oset, HEXDUMP_HEXSTUFF_PER_LINE,
+                    indent, offset, HEXDUMP_HEXSTUFF_PER_LINE,
                     hexstuff, asciistuff);
        }
+       if (truncated)
+               nd_trunc_longjmp(ndo);
 }
 
 void
-hex_and_ascii_print(netdissect_options *ndo, const char *ident,
-    const u_char *cp, u_int length)
+hex_and_ascii_print(netdissect_options *ndo, const char *indent,
+                   const u_char *cp, u_int length)
 {
-       hex_and_ascii_print_with_offset(ndo, ident, cp, length, 0);
+       hex_and_ascii_print_with_offset(ndo, indent, cp, length, 0);
 }
 
 /*
@@ -165,22 +171,25 @@ hex_and_ascii_print(netdissect_options *ndo, const char *ident,
  */
 void
 hex_print_with_offset(netdissect_options *ndo,
-                      const char *ident, const u_char *cp, u_int length,
-                     u_int oset)
+                      const char *indent, const u_char *cp, u_int length,
+                     u_int offset)
 {
        u_int caplength;
        u_int i, s;
        u_int nshorts;
+       int truncated = FALSE;
 
-       caplength = (ndo->ndo_snapend > cp) ? ND_BYTES_AVAILABLE_AFTER(cp) : 0;
-       if (length > caplength)
+       caplength = ND_BYTES_AVAILABLE_AFTER(cp);
+       if (length > caplength) {
                length = caplength;
+               truncated = TRUE;
+       }
        nshorts = length / sizeof(u_short);
        i = 0;
        while (nshorts != 0) {
                if ((i++ % 8) == 0) {
-                       ND_PRINT("%s0x%04x: ", ident, oset);
-                       oset += HEXDUMP_BYTES_PER_LINE;
+                       ND_PRINT("%s0x%04x: ", indent, offset);
+                       offset += HEXDUMP_BYTES_PER_LINE;
                }
                s = GET_U_1(cp);
                cp++;
@@ -190,35 +199,16 @@ hex_print_with_offset(netdissect_options *ndo,
        }
        if (length & 1) {
                if ((i % 8) == 0)
-                       ND_PRINT("%s0x%04x: ", ident, oset);
+                       ND_PRINT("%s0x%04x: ", indent, offset);
                ND_PRINT(" %02x", GET_U_1(cp));
        }
+       if (truncated)
+               nd_trunc_longjmp(ndo);
 }
 
-/*
- * just for completeness
- */
 void
-hex_print(netdissect_options *ndo,const char *ident, const u_char *cp, u_int length)
-{
-  hex_print_with_offset(ndo, ident, cp, length, 0);
-}
-
-#ifdef MAIN
-int
-main(int argc, char *argv[])
+hex_print(netdissect_options *ndo,
+         const char *indent, const u_char *cp, u_int length)
 {
-       hex_print("\n\t", "Hello, World!\n", 14);
-       printf("\n");
-       hex_and_ascii_print("\n\t", "Hello, World!\n", 14);
-       printf("\n");
-       ascii_print("Hello, World!\n", 14);
-       printf("\n");
-#define TMSG "Now is the winter of our discontent...\n"
-       hex_print_with_offset("\n\t", TMSG, sizeof(TMSG) - 1, 0x100);
-       printf("\n");
-       hex_and_ascii_print_with_offset("\n\t", TMSG, sizeof(TMSG) - 1, 0x100);
-       printf("\n");
-       exit(0);
+       hex_print_with_offset(ndo, indent, cp, length, 0);
 }
-#endif /* MAIN */