Fix spaces

[tcpdump] / print-ahcp.c

diff --git a/print-ahcp.c b/print-ahcp.c
index bd214be4bc5864c5f2b2bbefd05b9dba608ac203..0f6a49f1301a58727f24b9813814366dde00d209 100644 (file)
--- a/print-ahcp.c
+++ b/print-ahcp.c
@@ -30,16 +30,15 @@
 /* Based on draft-chroboczek-ahcp-00 and source code of ahcpd-0.53 */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #include "netdissect.h"
 #include "extract.h"
 #include "addrtoname.h"
 
-static const char tstr[] = " [|ahcp]";
 
 #define AHCP_MAGIC_NUMBER 43
 #define AHCP_VERSION_1 1
@@ -121,7 +120,7 @@ invalid:
        ND_TCHECK_LEN(cp, ep - cp);
        return 0;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return -1;
 }
 
@@ -139,7 +138,7 @@ invalid:
        ND_TCHECK_LEN(cp, ep - cp);
        return 0;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return -1;
 }
 
@@ -163,7 +162,7 @@ invalid:
        ND_TCHECK_LEN(cp, ep - cp);
        return 0;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return -1;
 }
 
@@ -187,7 +186,7 @@ invalid:
        ND_TCHECK_LEN(cp, ep - cp);
        return 0;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return -1;
 }
 
@@ -211,7 +210,7 @@ invalid:
        ND_TCHECK_LEN(cp, ep - cp);
        return 0;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return -1;
 }
 
@@ -235,7 +234,7 @@ invalid:
        ND_TCHECK_LEN(cp, ep - cp);
        return 0;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return -1;
 }
 
@@ -296,7 +295,7 @@ invalid:
        ND_TCHECK_LEN(cp, ep - cp);
        return;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }
 
 static void
@@ -341,15 +340,16 @@ invalid:
        ND_TCHECK_LEN(cp, ep - cp);
        return;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }
 
 void
 ahcp_print(netdissect_options *ndo, const u_char *cp, const u_int len)
 {
-       const u_char *ep = cp + len;
+       const u_char *ep = ndo->ndo_snapend;
        uint8_t version;
 
+       ndo->ndo_protocol = "ahcp";
        ND_PRINT("AHCP");
        if (len < 2)
                goto invalid;
@@ -407,5 +407,5 @@ invalid:
        ND_TCHECK_LEN(cp, ep - cp);
        return;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }