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

[tcpdump] / print-sunatm.c

diff --git a/print-sunatm.c b/print-sunatm.c
index d22e83a43d9dd8bb82fd3e7067f6651106461610..e1686d83d468e77e32f054678f6aea91346e1cb3 100644 (file)
--- a/print-sunatm.c
+++ b/print-sunatm.c
@@ -30,16 +30,15 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+/* \summary: SunATM DLPI capture printer */
+
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <tcpdump-stdinc.h>
-
-struct mbuf;
-struct rtentry;
+#include "netdissect-stdinc.h"
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 
 #include "atm.h"
@@ -70,16 +69,17 @@ sunatm_if_print(netdissect_options *ndo,
        u_char vpi;
        u_int traftype;
 
+       ndo->ndo_protocol = "sunatm_if";
        if (caplen < PKT_BEGIN_POS) {
-               ND_PRINT((ndo, "[|atm]"));
+               nd_print_trunc(ndo);
                return (caplen);
        }
 
        if (ndo->ndo_eflag) {
-               ND_PRINT((ndo, p[DIR_POS] & 0x80 ? "Tx: " : "Rx: "));
+               ND_PRINT(EXTRACT_U_1(p + DIR_POS) & 0x80 ? "Tx: " : "Rx: ");
        }
 
-       switch (p[DIR_POS] & 0x0f) {
+       switch (EXTRACT_U_1(p + DIR_POS) & 0x0f) {
 
        case PT_LANE:
                traftype = ATM_LANE;
@@ -94,8 +94,8 @@ sunatm_if_print(netdissect_options *ndo,
                break;
        }
 
-       vci = EXTRACT_16BITS(&p[VCI_POS]);
-       vpi = p[VPI_POS];
+       vci = EXTRACT_BE_U_2(p + VCI_POS);
+       vpi = EXTRACT_U_1(p + VPI_POS);
 
        p += PKT_BEGIN_POS;
        caplen -= PKT_BEGIN_POS;