Add an "fn_printzp()" routine for printing null-padded strings (strings

[tcpdump] / print-tftp.c

diff --git a/print-tftp.c b/print-tftp.c
index 45ec8e95bb56e071b89f1fc68dfc00b9909ea1ba..3ab61bc65ad80cfe57a08fadc8eeee6fb8cae255 100644 (file)
--- a/print-tftp.c
+++ b/print-tftp.c
@@ -22,8 +22,8 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-tftp.c,v 1.34 2003-02-19 08:01:36 guy Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-tftp.c,v 1.37 2003-11-16 09:36:40 guy Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -111,8 +111,8 @@ tftp_print(register const u_char *bp, u_int length)
                putchar('"');
 
                /* Print the mode and any options */
                putchar('"');
 
                /* Print the mode and any options */

-               while ((p = strchr(p, '\0')) != NULL) {
-                       if (length <= ((unsigned)p - (unsigned)&tp->th_block))
+               while ((p = (const u_char *)strchr((const char *)p, '\0')) != NULL) {
+                       if (length <= (u_int)(p - (const u_char *)&tp->th_block))

                                break;
                        p++;
                        if (*p != '\0') {
                                break;
                        p++;
                        if (*p != '\0') {