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

[tcpdump] / print-ahcp.c

diff --git a/print-ahcp.c b/print-ahcp.c
index 9ac7de05c7c7e072d3f104c35eccccb4516784fb..33866de028a8a5288662d4011c8255948005714a 100644 (file)
--- a/print-ahcp.c
+++ b/print-ahcp.c
@@ -39,7 +39,6 @@
 #include "extract.h"
 #include "addrtoname.h"
 
-static const char tstr[] = " [|ahcp]";
 
 #define AHCP_MAGIC_NUMBER 43
 #define AHCP_VERSION_1 1
@@ -117,11 +116,11 @@ ahcp_time_print(netdissect_options *ndo, const u_char *cp, const u_char *ep)
        return 0;
 
 invalid:
-       ND_PRINT("%s", istr);
+       nd_print_invalid(ndo);
        ND_TCHECK_LEN(cp, ep - cp);
        return 0;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return -1;
 }
 
@@ -135,11 +134,11 @@ ahcp_seconds_print(netdissect_options *ndo, const u_char *cp, const u_char *ep)
        return 0;
 
 invalid:
-       ND_PRINT("%s", istr);
+       nd_print_invalid(ndo);
        ND_TCHECK_LEN(cp, ep - cp);
        return 0;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return -1;
 }
 
@@ -159,11 +158,11 @@ ahcp_ipv6_addresses_print(netdissect_options *ndo, const u_char *cp, const u_cha
        return 0;
 
 invalid:
-       ND_PRINT("%s", istr);
+       nd_print_invalid(ndo);
        ND_TCHECK_LEN(cp, ep - cp);
        return 0;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return -1;
 }
 
@@ -183,11 +182,11 @@ ahcp_ipv4_addresses_print(netdissect_options *ndo, const u_char *cp, const u_cha
        return 0;
 
 invalid:
-       ND_PRINT("%s", istr);
+       nd_print_invalid(ndo);
        ND_TCHECK_LEN(cp, ep - cp);
        return 0;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return -1;
 }
 
@@ -207,11 +206,11 @@ ahcp_ipv6_prefixes_print(netdissect_options *ndo, const u_char *cp, const u_char
        return 0;
 
 invalid:
-       ND_PRINT("%s", istr);
+       nd_print_invalid(ndo);
        ND_TCHECK_LEN(cp, ep - cp);
        return 0;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return -1;
 }
 
@@ -231,11 +230,11 @@ ahcp_ipv4_prefixes_print(netdissect_options *ndo, const u_char *cp, const u_char
        return 0;
 
 invalid:
-       ND_PRINT("%s", istr);
+       nd_print_invalid(ndo);
        ND_TCHECK_LEN(cp, ep - cp);
        return 0;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return -1;
 }
 
@@ -292,11 +291,11 @@ ahcp1_options_print(netdissect_options *ndo, const u_char *cp, const u_char *ep)
        return;
 
 invalid:
-       ND_PRINT("%s", istr);
+       nd_print_invalid(ndo);
        ND_TCHECK_LEN(cp, ep - cp);
        return;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }
 
 static void
@@ -337,11 +336,11 @@ ahcp1_body_print(netdissect_options *ndo, const u_char *cp, const u_char *ep)
        return;
 
 invalid:
-       ND_PRINT("%s", istr);
+       nd_print_invalid(ndo);
        ND_TCHECK_LEN(cp, ep - cp);
        return;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }
 
 void
@@ -404,9 +403,9 @@ ahcp_print(netdissect_options *ndo, const u_char *cp, const u_int len)
        return;
 
 invalid:
-       ND_PRINT("%s", istr);
+       nd_print_invalid(ndo);
        ND_TCHECK_LEN(cp, ep - cp);
        return;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }