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

[tcpdump] / print-calm-fast.c

diff --git a/print-calm-fast.c b/print-calm-fast.c
index 16b416a3f9a516b122db8fb67ed6349e2c237255..5b79337a62f222e380b9f7f3e04aea71404ccd36 100644 (file)
--- a/print-calm-fast.c
+++ b/print-calm-fast.c
@@ -17,12 +17,11 @@
 
 /* \summary: Communication access for land mobiles (CALM) printer */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config.h>
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
+#define ND_LONGJMP_FROM_TCHECK
 #include "netdissect.h"
 #include "extract.h"
 #include "addrtoname.h"
@@ -40,37 +39,31 @@
 void
 calm_fast_print(netdissect_options *ndo, const u_char *bp, u_int length, const struct lladdr_info *src)
 {
-       int srcNwref;
-       int dstNwref;
+       ndo->ndo_protocol = "calm_fast";
 
-       ND_TCHECK_2(bp);
-       if (length < 2)
-               goto trunc;
-       srcNwref = bp[0];
-       dstNwref = 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("; ");
+
+       if (length < 2) {
+               ND_PRINT(" (length %u < 2)", length);
+               goto invalid;
+       }
+
+       ND_PRINT("SrcNwref:%u; ", GET_U_1(bp));
+       length -= 1;
+       bp += 1;
+
+       ND_PRINT("DstNwref:%u; ", GET_U_1(bp));
+       length -= 1;
+       bp += 1;
 
        if (ndo->ndo_vflag)
                ND_DEFAULTPRINT(bp, length);
        return;
 
-trunc:
-       ND_PRINT((ndo, "[|calm fast]"));
-       return;
+invalid:
+       nd_print_invalid(ndo);
+       ND_TCHECK_LEN(bp, length);
 }
-
-
-/*
- * Local Variables:
- * c-style: whitesmith
- * c-basic-offset: 8
- * End:
- */