From Kris Katterjohn: when building a SITA version of libpcap, don't

include dead code.

diff --git a/CREDITS b/CREDITS
index b357383d357363eb588aa0efaf018110b2d9c881..7ec2ae202bbd0f1639d79f1a1ffff5e49b62a6cc 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -57,6 +57,7 @@ Additional people who have contributed patches:
        Kazushi Sugyo                   <[email protected]>
        Klaus Klein                     <[email protected]>
        Koryn Grant                     <[email protected]>
+       Kris Katterjohn                 <[email protected]>
        Krzysztof Halasa                <[email protected]>
        Lorenzo Cavallaro               <[email protected]>
        Loris Degioanni                 <[email protected]>

diff --git a/pcap-linux.c b/pcap-linux.c
index a145bd49e030fcf980baffa424f770b64f01b5eb..96f269767d26ab52d0610dde9386465e4f032954 100644 (file)
--- a/pcap-linux.c
+++ b/pcap-linux.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/pcap-linux.c,v 1.129.2.1 2007-10-20 01:18:50 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/pcap-linux.c,v 1.129.2.2 2007-11-18 04:37:53 guy Exp $ (LBL)";
 #endif
 
 /*
@@ -989,8 +989,7 @@ pcap_setfilter_linux(pcap_t *handle, struct bpf_program *filter)
 
 #ifdef SITA
        return acn_setfilter(handle->fd, filter);
-#endif
-
+#else
        /* Make our private copy of the filter */
 
        if (install_bpf_program(handle, filter) < 0)
@@ -1106,6 +1105,7 @@ pcap_setfilter_linux(pcap_t *handle, struct bpf_program *filter)
 #endif /* SO_ATTACH_FILTER */
 
        return 0;
+#endif /* SITA */
 }
 
 /*
@@ -1754,9 +1754,7 @@ static void       pcap_close_linux( pcap_t *handle )
 {
 #ifdef SITA
        pcap_close_acn(handle);
-       return;
-#endif
-
+#else
        struct pcap     *p, *prevp;
        struct ifreq    ifr;
 
@@ -1825,6 +1823,7 @@ static void       pcap_close_linux( pcap_t *handle )
                free(handle->md.device);
        handle->md.device = NULL;
        pcap_close_common(handle);
+#endif /* SITA */
 }
 
 /*