Get rid of old non-interface specific settings which are now interface

specifc. This finalizes the change of the infrastructure.
This patch is based on work by Irene Ruengeler.

svn path=/trunk/; revision=37794

1 files changed, 15 insertions, 22 deletions

diff --git a/capture_ui_utils.c b/capture_ui_utils.c
index 90b8b435bc..1ebe978c68 100644
--- a/capture_ui_utils.c
+++ b/capture_ui_utils.c
@@ -395,33 +395,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)
-{
-	if (!capture_opts->iface_descr && capture_opts->iface)
-		capture_opts->iface_descr = get_interface_descriptive_name(capture_opts->iface);
-
-	return(capture_opts->iface_descr);
-
-}
-
-const char *
 get_iface_description_for_interface(capture_options *capture_opts, guint i)
 {
-	interface_options interface_opts;
-
-	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);
+  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 */