remove more stray prototypes

[tcpdump] / tcpdump.c

diff --git a/tcpdump.c b/tcpdump.c
index e7986c1c14db1ddd04951e7614ccf5e5cef74ffc..75ea7eb70f0e9ceda223139aee0a222915d8f472 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -167,10 +167,6 @@ struct ndo_printer {
 
 
 static const struct printer printers[] = {
 
 
 static const struct printer printers[] = {

-       { sl_if_print,          DLT_SLIP },
-#ifdef DLT_SLIP_BSDOS
-       { sl_bsdos_if_print,    DLT_SLIP_BSDOS },
-#endif

        { ppp_if_print,         DLT_PPP },
 #ifdef DLT_PPP_WITHDIRECTION
        { ppp_if_print,         DLT_PPP_WITHDIRECTION },
        { ppp_if_print,         DLT_PPP },
 #ifdef DLT_PPP_WITHDIRECTION
        { ppp_if_print,         DLT_PPP_WITHDIRECTION },


@@ -178,28 +174,18 @@ static const struct printer printers[] = {
 #ifdef DLT_PPP_BSDOS
        { ppp_bsdos_if_print,   DLT_PPP_BSDOS },
 #endif
 #ifdef DLT_PPP_BSDOS
        { ppp_bsdos_if_print,   DLT_PPP_BSDOS },
 #endif

-       { atm_if_print,         DLT_ATM_RFC1483 },

 #ifdef DLT_PPP_SERIAL
        { ppp_hdlc_if_print,    DLT_PPP_SERIAL },
 #endif
 #ifdef DLT_IEEE802_11
        { ieee802_11_if_print,  DLT_IEEE802_11},
 #endif
 #ifdef DLT_PPP_SERIAL
        { ppp_hdlc_if_print,    DLT_PPP_SERIAL },
 #endif
 #ifdef DLT_IEEE802_11
        { ieee802_11_if_print,  DLT_IEEE802_11},
 #endif

-#ifdef DLT_LTALK
-       { ltalk_if_print,       DLT_LTALK },
-#endif
-#ifdef DLT_SUNATM
-       { sunatm_if_print,      DLT_SUNATM },
-#endif

 #ifdef DLT_PRISM_HEADER
        { prism_if_print,       DLT_PRISM_HEADER },
 #endif
 #ifdef DLT_IEEE802_11_RADIO
        { ieee802_11_radio_if_print,    DLT_IEEE802_11_RADIO },
 #endif
 #ifdef DLT_PRISM_HEADER
        { prism_if_print,       DLT_PRISM_HEADER },
 #endif
 #ifdef DLT_IEEE802_11_RADIO
        { ieee802_11_radio_if_print,    DLT_IEEE802_11_RADIO },
 #endif

-#ifdef DLT_ENC
-       { enc_if_print,         DLT_ENC },
-#endif

 #ifdef DLT_IEEE802_11_RADIO_AVS
        { ieee802_11_radio_avs_if_print,        DLT_IEEE802_11_RADIO_AVS },
 #endif
 #ifdef DLT_IEEE802_11_RADIO_AVS
        { ieee802_11_radio_avs_if_print,        DLT_IEEE802_11_RADIO_AVS },
 #endif


@@ -343,6 +329,20 @@ static const struct ndo_printer ndo_printers[] = {
 #endif
 #ifdef DLT_MFR
        { mfr_if_print,         DLT_MFR },
 #endif
 #ifdef DLT_MFR
        { mfr_if_print,         DLT_MFR },

+#endif
+       { atm_if_print,         DLT_ATM_RFC1483 },
+#ifdef DLT_SUNATM
+       { sunatm_if_print,      DLT_SUNATM },
+#endif
+#ifdef DLT_ENC
+       { enc_if_print,         DLT_ENC },
+#endif
+       { sl_if_print,          DLT_SLIP },
+#ifdef DLT_SLIP_BSDOS
+       { sl_bsdos_if_print,    DLT_SLIP_BSDOS },
+#endif
+#ifdef DLT_LTALK
+       { ltalk_if_print,       DLT_LTALK },

 #endif
        { NULL,                 0 },
 };
 #endif
        { NULL,                 0 },
 };