Fix spaces

[tcpdump] / print-calm-fast.c

diff --git a/print-calm-fast.c b/print-calm-fast.c
index c9be008cc29fc497ac41db6e5959a538d230c967..45bb5cc781828a775e46651113b161ce3a6a7d8b 100644 (file)
--- a/print-calm-fast.c
+++ b/print-calm-fast.c
@@ -18,12 +18,13 @@
 /* \summary: Communication access for land mobiles (CALM) printer */
 
 #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"
 
 /*
@@ -39,37 +40,30 @@
 void
 calm_fast_print(netdissect_options *ndo, const u_char *bp, u_int length, const struct lladdr_info *src)
 {
-       int srcNwref;
-       int dstNwref;
+       u_int srcNwref;
+       u_int dstNwref;
 
-       ND_TCHECK2(*bp, 2);
+       ndo->ndo_protocol = "calm_fast";
+       ND_TCHECK_2(bp);
        if (length < 2)
                goto trunc;
-       srcNwref = bp[0];
-       dstNwref = bp[1];
+       srcNwref = EXTRACT_U_1(bp);
+       dstNwref = EXTRACT_U_1(bp + 1);
        length -= 2;
        bp += 2;
 
-       ND_PRINT((ndo, "CALM FAST"));
+       ND_PRINT("CALM FAST");
        if (src != NULL)
-               ND_PRINT((ndo, " src:%s", (src->addr_string)(ndo, src->addr)));
-       ND_PRINT((ndo, "; "));
-       ND_PRINT((ndo, "SrcNwref:%d; ", srcNwref));
-       ND_PRINT((ndo, "DstNwref:%d; ", dstNwref));
+               ND_PRINT(" src:%s", (src->addr_string)(ndo, src->addr));
+       ND_PRINT("; ");
+       ND_PRINT("SrcNwref:%u; ", srcNwref);
+       ND_PRINT("DstNwref:%u; ", dstNwref);
 
        if (ndo->ndo_vflag)
                ND_DEFAULTPRINT(bp, length);
        return;
 
 trunc:
-       ND_PRINT((ndo, "[|calm fast]"));
+       nd_print_trunc(ndo);
        return;
 }
-
-
-/*
- * Local Variables:
- * c-style: whitesmith
- * c-basic-offset: 8
- * End:
- */