Fixed some warnings, added print-zep.c to CMakeLists

[tcpdump] / print-tftp.c

diff --git a/print-tftp.c b/print-tftp.c
index 1cd1c3f8420fdc8c84e96454cf60b0746de3f8e6..2630e554caea64c8a0dc283bcca31a01c0230ce8 100644 (file)
--- a/print-tftp.c
+++ b/print-tftp.c
@@ -58,7 +58,6 @@
 #define        EEXISTS         6               /* file already exists */
 #define        ENOUSER         7               /* no such user */
 
-static const char tstr[] = " [|tftp]";
 
 /* op code to string mapping */
 static const struct tok op2str[] = {
@@ -121,7 +120,7 @@ tftp_print(netdissect_options *ndo,
                ND_PRINT(" ");
                /* Print filename */
                ND_PRINT("\"");
-               ui = fn_printztn(ndo, bp, length, ndo->ndo_snapend);
+               ui = nd_printztn(ndo, bp, length, ndo->ndo_snapend);
                ND_PRINT("\"");
                if (ui == 0)
                        goto trunc;
@@ -132,7 +131,7 @@ tftp_print(netdissect_options *ndo,
                if (length == 0)
                        goto trunc;     /* no mode */
                ND_PRINT(" ");
-               ui = fn_printztn(ndo, bp, length, ndo->ndo_snapend);
+               ui = nd_printztn(ndo, bp, length, ndo->ndo_snapend);
                if (ui == 0)
                        goto trunc;
                bp += ui;
@@ -143,7 +142,7 @@ tftp_print(netdissect_options *ndo,
                        ND_TCHECK_1(bp);
                        if (EXTRACT_U_1(bp) != '\0')
                                ND_PRINT(" ");
-                       ui = fn_printztn(ndo, bp, length, ndo->ndo_snapend);
+                       ui = nd_printztn(ndo, bp, length, ndo->ndo_snapend);
                        if (ui == 0)
                                goto trunc;
                        bp += ui;
@@ -157,7 +156,7 @@ tftp_print(netdissect_options *ndo,
                        ND_TCHECK_1(bp);
                        if (EXTRACT_U_1(bp) != '\0')
                                ND_PRINT(" ");
-                       ui = fn_printztn(ndo, bp, length, ndo->ndo_snapend);
+                       ui = nd_printztn(ndo, bp, length, ndo->ndo_snapend);
                        if (ui == 0)
                                goto trunc;
                        bp += ui;
@@ -186,7 +185,7 @@ tftp_print(netdissect_options *ndo,
                if (length == 0)
                        goto trunc;     /* no error message */
                ND_PRINT(" \"");
-               ui = fn_printztn(ndo, bp, length, ndo->ndo_snapend);
+               ui = nd_printztn(ndo, bp, length, ndo->ndo_snapend);
                ND_PRINT("\"");
                if (ui == 0)
                        goto trunc;
@@ -199,6 +198,6 @@ tftp_print(netdissect_options *ndo,
        }
        return;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return;
 }