Add a "pcap_close_common()" routine which can be used as the close

[libpcap] / pcap-snoop.c

diff --git a/pcap-snoop.c b/pcap-snoop.c
index 18e4b6d2933b10da514302a338cb3b92f96b5921..7a27b10b174b5406e198f85ffecd91fcb4e57472 100644 (file)
--- a/pcap-snoop.c
+++ b/pcap-snoop.c
@@ -20,7 +20,7 @@
  */
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/pcap-snoop.c,v 1.53 2004-04-07 18:33:29 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/pcap-snoop.c,v 1.54 2004-10-19 07:06:14 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -193,15 +193,6 @@ pcap_stats_snoop(pcap_t *p, struct pcap_stat *ps)
        return (0);
 }
 
-static void
-pcap_close_snoop(pcap_t *p)
-{
-       if (p->buffer != NULL)
-               free(p->buffer);
-       if (p->fd >= 0)
-               close(p->fd);
-}
-
 /* XXX can't disable promiscuous */
 pcap_t *
 pcap_open_live(const char *device, int snaplen, int promisc, int to_ms,
@@ -392,7 +383,7 @@ pcap_open_live(const char *device, int snaplen, int promisc, int to_ms,
        p->getnonblock_op = pcap_getnonblock_fd;
        p->setnonblock_op = pcap_setnonblock_fd;
        p->stats_op = pcap_stats_snoop;
-       p->close_op = pcap_close_snoop;
+       p->close_op = pcap_close_common;
 
        return (p);
  bad: