BOOTP: try to fix 2 newly added compile warnings

[tcpdump] / print-ascii.c

diff --git a/print-ascii.c b/print-ascii.c
index 3ff8887b1f5a09c5c5069e6a100282e14561eae9..2f05c3873d210423c7e61d6b6b4ea92a00e7543c 100644 (file)
--- a/print-ascii.c
+++ b/print-ascii.c
@@ -62,16 +62,30 @@ ascii_print(register const u_char *cp, register u_int length)
        while (length > 0) {
                s = *cp++;
                length--;
-               if (!ND_ISGRAPH(s) &&
-                   (s != '\t' && s != ' ' && s != '\n' && s != '\r'))
-                       putchar('.');
-               else
-                       putchar(s);
+               if (s == '\r') {
+                       /*
+                        * Don't print CRs at the end of the line; they
+                        * don't belong at the ends of lines on UN*X,
+                        * and the standard I/O library will give us one
+                        * on Windows so we don't need to print one
+                        * ourselves.
+                        *
+                        * In the middle of a line, just print a '.'.
+                        */
+                       if (length > 1 && *cp != '\n')
+                               putchar('.');
+               } else {
+                       if (!ND_ISGRAPH(s) &&
+                           (s != '\t' && s != ' ' && s != '\n'))
+                               putchar('.');
+                       else
+                               putchar(s);
+               }
        }
 }
 
 void
-hex_and_ascii_print_with_offset(register const char *ident,
+hex_and_ascii_print_with_offset(netdissect_options *ndo, register const char *ident,
     register const u_char *cp, register u_int length, register u_int oset)
 {
        register u_int i;
@@ -94,9 +108,9 @@ hex_and_ascii_print_with_offset(register const char *ident,
                i++;
                if (i >= HEXDUMP_SHORTS_PER_LINE) {
                        *hsp = *asp = '\0';
-                       (void)printf("%s0x%04x: %-*s  %s",
+                       ND_PRINT((ndo, "%s0x%04x: %-*s  %s",
                            ident, oset, HEXDUMP_HEXSTUFF_PER_LINE,
-                           hexstuff, asciistuff);
+                           hexstuff, asciistuff));
                        i = 0; hsp = hexstuff; asp = asciistuff;
                        oset += HEXDUMP_BYTES_PER_LINE;
                }
@@ -111,17 +125,17 @@ hex_and_ascii_print_with_offset(register const char *ident,
        }
        if (i > 0) {
                *hsp = *asp = '\0';
-               (void)printf("%s0x%04x: %-*s  %s",
+               ND_PRINT((ndo, "%s0x%04x: %-*s  %s",
                     ident, oset, HEXDUMP_HEXSTUFF_PER_LINE,
-                    hexstuff, asciistuff);
+                    hexstuff, asciistuff));
        }
 }
 
 void
-hex_and_ascii_print(register const char *ident, register const u_char *cp,
-    register u_int length)
+hex_and_ascii_print(netdissect_options *ndo, register const char *ident,
+    register const u_char *cp, register u_int length)
 {
-       hex_and_ascii_print_with_offset(ident, cp, length, 0);
+       hex_and_ascii_print_with_offset(ndo, ident, cp, length, 0);
 }
 
 /*
@@ -139,16 +153,16 @@ hex_print_with_offset(netdissect_options *ndo,
        i = 0;
        while (--nshorts >= 0) {
                if ((i++ % 8) == 0) {
-                  (void)ND_PRINT((ndo,"%s0x%04x: ", ident, oset));
-                  oset += HEXDUMP_BYTES_PER_LINE;
+                       ND_PRINT((ndo,"%s0x%04x: ", ident, oset));
+                       oset += HEXDUMP_BYTES_PER_LINE;
                }
                s = *cp++;
-               (void)ND_PRINT((ndo," %02x%02x", s, *cp++));
+               ND_PRINT((ndo," %02x%02x", s, *cp++));
        }
        if (length & 1) {
                if ((i % 8) == 0)
-                  (void)ND_PRINT((ndo,"%s0x%04x: ", ident, oset));
-               (void)ND_PRINT((ndo," %02x", *cp));
+                       ND_PRINT((ndo,"%s0x%04x: ", ident, oset));
+               ND_PRINT((ndo," %02x", *cp));
        }
 }