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

[tcpdump] / print-l2tp.c

diff --git a/print-l2tp.c b/print-l2tp.c
index a5cc378b746a322d4a3b2e7f9459a5ab9ba2082a..a320873444f1a7b7b841c8f417633f7c8754ad01 100644 (file)
--- a/print-l2tp.c
+++ b/print-l2tp.c
@@ -25,9 +25,7 @@
 
 /* specification: RFC 2661 */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "netdissect-stdinc.h"
 
@@ -265,16 +263,6 @@ static char *l2tp_error_code_general[] = {
 /******************************/
 /* generic print out routines */
 /******************************/
-static void
-print_string(netdissect_options *ndo, const u_char *dat, u_int length)
-{
-       u_int i;
-       for (i=0; i<length; i++) {
-               fn_print_char(ndo, GET_U_1(dat));
-               dat++;
-       }
-}
-
 static void
 print_octets(netdissect_options *ndo, const u_char *dat, u_int length)
 {
@@ -338,7 +326,7 @@ l2tp_result_code_print(netdissect_options *ndo, const u_char *dat, u_int length)
        if (length == 0)
                return;
        ND_PRINT(" ");
-       print_string(ndo, dat, length);
+       nd_printjn(ndo, dat, length);
 }
 
 static void
@@ -395,7 +383,7 @@ l2tp_q931_cc_print(netdissect_options *ndo, const u_char *dat, u_int length)
        length -= 3;
        if (length != 0) {
                ND_PRINT(" ");
-               print_string(ndo, dat, length);
+               nd_printjn(ndo, dat, length);
        }
 }
 
@@ -561,7 +549,7 @@ l2tp_ppp_discon_cc_print(netdissect_options *ndo, const u_char *dat, u_int lengt
 
        if (length != 0) {
                ND_PRINT(" ");
-               print_string(ndo, (const u_char *)dat, length);
+               nd_printjn(ndo, (const u_char *)dat, length);
        }
 }
 
@@ -661,7 +649,7 @@ l2tp_avp_print(netdissect_options *ndo, const u_char *dat, u_int length)
                        case L2TP_AVP_SUB_ADDRESS:
                        case L2TP_AVP_PROXY_AUTH_NAME:
                        case L2TP_AVP_PRIVATE_GRP_ID:
-                               print_string(ndo, dat, len-6);
+                               nd_printjn(ndo, dat, len-6);
                                break;
                        case L2TP_AVP_CHALLENGE:
                        case L2TP_AVP_INI_RECV_LCP: