Revert r37857, r37861
authordarkjames <darkjames@f5534014-38df-0310-8fa8-9805f1628bb7>
Fri, 1 Jul 2011 22:26:02 +0000 (22:26 +0000)
committerdarkjames <darkjames@f5534014-38df-0310-8fa8-9805f1628bb7>
Fri, 1 Jul 2011 22:26:02 +0000 (22:26 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37862 f5534014-38df-0310-8fa8-9805f1628bb7

dumpcap.c

index 98fb5784ca10aa00bf27c3569ba381dd89dca41e..d0eb9cc7b4913eb8c9e0465a15df0f4468ad0a3a 100644 (file)
--- a/dumpcap.c
+++ b/dumpcap.c
@@ -637,30 +637,9 @@ open_capture_device(interface_options *interface_opts,
         g_log(LOG_DOMAIN_CAPTURE_CHILD, G_LOG_LEVEL_DEBUG,
               "pcap_open_live() calling using name %s, snaplen %d, promisc_mode %d.",
               interface_opts->name, interface_opts->snaplen, interface_opts->promisc_mode);
-#ifdef _MSC_VER
-        __try {
-            pcap_h = pcap_open_live(interface_opts->name, interface_opts->snaplen,
-                                    interface_opts->promisc_mode, CAP_READ_TIMEOUT,
-                                    *open_err_str);
-        } __except(TRUE) {
-            if (GetExceptionCode() == STATUS_ACCESS_VIOLATION) {
-                EXCEPTION_POINTERS *ex = GetExceptionInformation();
-
-                g_log(LOG_DOMAIN_CAPTURE_CHILD, G_LOG_LEVEL_ERROR, "Exception from pcap_open_live(): %s AV @ %p IP: %p\n", 
-                        (ex->ExceptionInformation[0] ? "WRITE" : "READ"),
-                        (void *) ex->ExceptionInformation[1],
-                        (void *) ex->ExceptionAddress);
-
-                g_log(LOG_DOMAIN_CAPTURE_CHILD, G_LOG_LEVEL_DEBUG, "open_err_str: %p, %p", open_err_str, *open_err_str);
-            } else
-                g_log(LOG_DOMAIN_CAPTURE_CHILD, G_LOG_LEVEL_ERROR, "Exception from pcap_open_live(): 0x%x (0x%x)\n", GetExceptionCode(), ERROR_PROC_NOT_FOUND);
-            pcap_h = NULL;
-        }
-#else
         pcap_h = pcap_open_live(interface_opts->name, interface_opts->snaplen,
                                 interface_opts->promisc_mode, CAP_READ_TIMEOUT,
                                 *open_err_str);
-#endif
         g_log(LOG_DOMAIN_CAPTURE_CHILD, G_LOG_LEVEL_DEBUG,
               "pcap_open_live() returned %p.", (void *)pcap_h);
 #endif