From Colin O'Flynn:

[obnox/wireshark/wip.git] / airpcap_loader.c

diff --git a/airpcap_loader.c b/airpcap_loader.c
index 1887dd80e640b3e6a8362d6f0930f7a5a2a35d7f..83f4697e3cb32147cf9a171c2a4be0c65962631a 100644 (file)
--- a/airpcap_loader.c
+++ b/airpcap_loader.c
@@ -49,7 +49,7 @@
 #include "capture_ui_utils.h"
 #include <wsutil/file_util.h>
 
-#include "simple_dialog.h"
+#include "ui/simple_dialog.h"
 
 #include <airpcap.h>
 #include "airpcap_loader.h"
@@ -1453,35 +1453,16 @@ get_airpcap_interface_list(int *err, char **err_str)
  */
 airpcap_if_info_t* get_airpcap_if_from_name(GList* if_list, const gchar* name)
 {
-    unsigned int ifn;
-    GList* curr;
-    airpcap_if_info_t* if_info;
+       GList* curr;
+       airpcap_if_info_t* if_info;
 
-    ifn = 0;
-    if(if_list != NULL)
-    {
-       while( ifn < g_list_length(if_list) )
-       {
-           curr = g_list_nth(if_list, ifn);
-
-           if_info = NULL;
-           if(curr != NULL)
-                   if_info = curr->data;
-           if(if_info != NULL)
-           {
-               if ( g_ascii_strcasecmp(if_info->name,name) == 0
-#ifdef HAVE_PCAP_REMOTE /* The interface will be prepended with "rpcap://" */
-                       || g_str_has_suffix(name, if_info->name)
-#endif
-                       )
-               {
-                   return if_info;
+       for (curr = g_list_first(if_list); curr; curr = g_list_next(curr)) {
+               if_info = (airpcap_if_info_t *)curr->data;
+               if (if_info && (g_ascii_strcasecmp(if_info->name, name) == 0)) {
+                       return (if_info);
                }
-           }
-           ifn++;
        }
-    }
-    return NULL;
+       return (NULL);
 }
 
 /*
@@ -2266,6 +2247,7 @@ test_if_on(pref_t *pref, gpointer ud)
 
 /*
  * Returns TRUE if the Wireshark decryption is active, false otherwise
+ * XXX - Should we just add a routine to packet-ieee80211.c to grab this directly?
  */
 gboolean
 wireshark_decryption_on(void)