NDOize safeputs() and safeputchar()

[tcpdump] / print-mpls.c

diff --git a/print-mpls.c b/print-mpls.c
index cd323ce26c44667170ad02fcdaaf8a60bd0d78fc..bf232ae3a83caa4b48ed3e1532d231a4f04b559b 100644 (file)
--- a/print-mpls.c
+++ b/print-mpls.c
@@ -26,6 +26,7 @@
  * SUCH DAMAGE.
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -174,7 +175,7 @@ mpls_print(netdissect_options *ndo, const u_char *bp, u_int length)
         */
        if (pt == PT_UNKNOWN) {
                if (!ndo->ndo_suppress_default_print)
-                       ndo->ndo_default_print(ndo, p, length - (p - bp));
+                       ND_DEFAULTPRINT(p, length - (p - bp));
                return;
        }
        ND_PRINT((ndo, ndo->ndo_vflag ? "\n\t" : " "));
@@ -193,7 +194,7 @@ mpls_print(netdissect_options *ndo, const u_char *bp, u_int length)
                break;
 
        case PT_OSI:
-               isoclns_print(p, length - (p - bp), length - (p - bp));
+               isoclns_print(ndo, p, length - (p - bp), length - (p - bp));
                break;
 
        default: