Add '-Wunreachable-code-return' warning option in devel mode for cmake

[tcpdump] / print-802_15_4.c

diff --git a/print-802_15_4.c b/print-802_15_4.c
index 17d0ded746f3e65577487a76766a0a6b50e78d75..f9f05d2f3f5d20055042f2b5bc142b2d5dca34e4 100644 (file)
--- a/print-802_15_4.c
+++ b/print-802_15_4.c
@@ -70,8 +70,9 @@ ieee802_15_4_print(netdissect_options *ndo,
        uint8_t seq;
        uint16_t panid = 0;
 
+       ndo->ndo_protocol = "802.15.4";
        if (caplen < 3) {
-               ND_PRINT("[|802.15.4]");
+               nd_print_trunc(ndo);
                return caplen;
        }
        hdrlen = 3;
@@ -97,7 +98,7 @@ ieee802_15_4_print(netdissect_options *ndo,
                         * the source and destination addresses be present,
                         * but the destination address is missing.
                         */
-                       ND_PRINT("[|802.15.4]");
+                       nd_print_trunc(ndo);
                        return hdrlen;
                }
                if (ndo->ndo_vflag)
@@ -109,7 +110,7 @@ ieee802_15_4_print(netdissect_options *ndo,
                return hdrlen;
        case FC_ADDRESSING_MODE_SHORT:
                if (caplen < 2) {
-                       ND_PRINT("[|802.15.4]");
+                       nd_print_trunc(ndo);
                        return hdrlen;
                }
                panid = EXTRACT_LE_U_2(p);
@@ -117,7 +118,7 @@ ieee802_15_4_print(netdissect_options *ndo,
                caplen -= 2;
                hdrlen += 2;
                if (caplen < 2) {
-                       ND_PRINT("[|802.15.4]");
+                       nd_print_trunc(ndo);
                        return hdrlen;
                }
                if (ndo->ndo_vflag)
@@ -128,7 +129,7 @@ ieee802_15_4_print(netdissect_options *ndo,
                break;
        case FC_ADDRESSING_MODE_LONG:
                if (caplen < 2) {
-                       ND_PRINT("[|802.15.4]");
+                       nd_print_trunc(ndo);
                        return hdrlen;
                }
                panid = EXTRACT_LE_U_2(p);
@@ -136,7 +137,7 @@ ieee802_15_4_print(netdissect_options *ndo,
                caplen -= 2;
                hdrlen += 2;
                if (caplen < 8) {
-                       ND_PRINT("[|802.15.4]");
+                       nd_print_trunc(ndo);
                        return hdrlen;
                }
                if (ndo->ndo_vflag)
@@ -169,7 +170,7 @@ ieee802_15_4_print(netdissect_options *ndo,
                         * PAN ID, fetched above.)
                         */
                        if (caplen < 2) {
-                               ND_PRINT("[|802.15.4]");
+                               nd_print_trunc(ndo);
                                return hdrlen;
                        }
                        panid = EXTRACT_LE_U_2(p);
@@ -178,7 +179,7 @@ ieee802_15_4_print(netdissect_options *ndo,
                        hdrlen += 2;
                }
                if (caplen < 2) {
-                       ND_PRINT("[|802.15.4]");
+                       nd_print_trunc(ndo);
                        return hdrlen;
                }
                if (ndo->ndo_vflag)
@@ -195,7 +196,7 @@ ieee802_15_4_print(netdissect_options *ndo,
                         * PAN ID, fetched above.)
                         */
                        if (caplen < 2) {
-                               ND_PRINT("[|802.15.4]");
+                               nd_print_trunc(ndo);
                                return hdrlen;
                        }
                        panid = EXTRACT_LE_U_2(p);
@@ -204,7 +205,7 @@ ieee802_15_4_print(netdissect_options *ndo,
                        hdrlen += 2;
                }
                if (caplen < 8) {
-                       ND_PRINT("[|802.15.4]");
+                       nd_print_trunc(ndo);
                        return hdrlen;
                }
                if (ndo->ndo_vflag)
@@ -226,5 +227,6 @@ u_int
 ieee802_15_4_if_print(netdissect_options *ndo,
                       const struct pcap_pkthdr *h, const u_char *p)
 {
+       ndo->ndo_protocol = "802.15.4_if";
        return ieee802_15_4_print(ndo, p, h->caplen);
 }