See if this makes it build cleanly.

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

diff --git a/capture_ui_utils.c b/capture_ui_utils.c
index ba011e23cf599077a1fc11d5e29554dce8a4d350..48bca7a31b5d89204d9d4a37e37a86a48b95ee09 100644 (file)
--- a/capture_ui_utils.c
+++ b/capture_ui_utils.c
@@ -38,6 +38,9 @@
 #include "epan/ex-opt.h"
 #include "capture_ifinfo.h"
 #include "capture_ui_utils.h"
+#include "ui/simple_dialog.h"
+#include "wiretap/wtap.h"
+#include "epan/to_str.h"
 
 /*
  * Find user-specified capture device description that matches interface
@@ -172,7 +175,7 @@ get_interface_descriptive_name(const char *if_name)
        one from the OS or libpcap? */
     descr = NULL;
     if_list = capture_interface_list(&err, NULL);
-    if (if_list != NULL && if_name != NULL) {
+    if (if_list != NULL) {
       if_entry = if_list;
       do {
         if_info = if_entry->data;
@@ -395,17 +398,26 @@ get_if_name(const char *if_text)
   return if_name;
 }
 
-/*  Return capture_opts->iface_descr (after setting it if it is not set)
- *  This is necessary because capture_opts.c can't set iface_descr (at least
+/*  Return interface_opts->descr (after setting it if it is not set)
+ *  This is necessary because capture_opts.c can't set descr (at least
  *  not without adding significant dependencies there).
  */
 const char *
-get_iface_description(capture_options *capture_opts)
+get_iface_description_for_interface(capture_options *capture_opts, guint i)
 {
-       if (!capture_opts->iface_descr && capture_opts->iface)
-               capture_opts->iface_descr = get_interface_descriptive_name(capture_opts->iface);
-
-       return(capture_opts->iface_descr);
-
+  interface_options interface_opts;
+
+  if (i < capture_opts->ifaces->len) {
+    interface_opts = g_array_index(capture_opts->ifaces, interface_options, i);
+    if (!interface_opts.descr && interface_opts.name) {
+      interface_opts.descr = get_interface_descriptive_name(interface_opts.name);
+      capture_opts->ifaces = g_array_remove_index(capture_opts->ifaces, i);
+      g_array_insert_val(capture_opts->ifaces, i, interface_opts);
+    }
+    return (interface_opts.descr);
+  } else {
+    return (NULL);
+  }
 }
+
 #endif /* HAVE_LIBPCAP */