Fix typoes (sigh, using both "p" and "handle" for the pcap_t pointer in

different modules can lead to confusion).

diff --git a/pcap-bt-linux.c b/pcap-bt-linux.c
index 4f1b8566ae3affe67580caaa80fb0d01cc7ef63f..a6e89c95b2fb1400b8cfce0c6d6fa3520a40ded0 100644 (file)
--- a/pcap-bt-linux.c
+++ b/pcap-bt-linux.c
@@ -33,7 +33,7 @@
  */
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/pcap-bt-linux.c,v 1.9.2.4 2008-04-14 20:41:51 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/pcap-bt-linux.c,v 1.9.2.5 2008-04-14 21:08:04 guy Exp $ (LBL)";
 #endif
  
 #ifdef HAVE_CONFIG_H
@@ -231,7 +231,7 @@ bt_activate(pcap_t* handle)
                goto close_fail;
        }
 
-       if (p->opt.rfmon) {
+       if (handle->opt.rfmon) {
                /*
                 * Monitor mode doesn't apply to Bluetooth devices.
                 */
@@ -256,7 +256,7 @@ bt_activate(pcap_t* handle)
        return 0;
 
 close_fail:
-       pcap_cleanup_live_common(p);
+       pcap_cleanup_live_common(handle);
        return err;
 }
 

diff --git a/pcap-usb-linux.c b/pcap-usb-linux.c
index ff7468c96a4e623492e9c4671e11191dd5d23b6f..830abc775658d19ab91182570aa12a4cffb3cbeb 100644 (file)
--- a/pcap-usb-linux.c
+++ b/pcap-usb-linux.c
@@ -34,7 +34,7 @@
  */
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/pcap-usb-linux.c,v 1.16.2.7 2008-04-14 20:41:52 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/pcap-usb-linux.c,v 1.16.2.8 2008-04-14 21:06:29 guy Exp $ (LBL)";
 #endif
  
 #ifdef HAVE_CONFIG_H
@@ -226,7 +226,7 @@ usb_activate(pcap_t* handle)
        handle->fd = open(full_path, O_RDONLY, 0);
        if (handle->fd >= 0)
        {
-               if (p->opt.rfmon) {
+               if (handle->opt.rfmon) {
                        /*
                         * Monitor mode doesn't apply to USB devices.
                         */
@@ -266,7 +266,7 @@ usb_activate(pcap_t* handle)
                handle->read_op = usb_read_linux;
        }
 
-       if (p->opt.rfmon) {
+       if (handle->opt.rfmon) {
                /*
                 * Monitor mode doesn't apply to USB devices.
                 */