Propagate the recent interface list changes (r20521) to the AirPcap code.

Fix a mismatched declaration found by Gisle Vanem.

svn path=/trunk/; revision=20535

4 files changed, 8 insertions, 8 deletions

diff --git a/airpcap_loader.h b/airpcap_loader.h
index e0302d5cc2..1286b5a832 100644
--- a/airpcap_loader.h
+++ b/airpcap_loader.h
@@ -309,7 +309,7 @@ int load_airpcap(void);
  * Will return null if no device is found.
  */
 GList*
-get_airpcap_interface_list(int *err, char *err_str);
+get_airpcap_interface_list(int *err, char **err_str);
 
 /*
  * Returns the ASCII string of a key given the key bites
diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c
index 8676b57a12..192f6a6dc1 100644
--- a/gtk/capture_dlg.c
+++ b/gtk/capture_dlg.c
@@ -196,7 +196,7 @@ set_link_type_list(GtkWidget *linktype_om, GtkWidget *entry)
   /* Deallocate the existing menu for Datalink header type */
   if (dl_hdr_menu != NULL)
     gtk_widget_destroy(dl_hdr_menu);
-  
+
   lt_menu = gtk_menu_new();
   dl_hdr_menu= lt_menu;
   entry_text = g_strdup(gtk_entry_get_text(GTK_ENTRY(entry)));
@@ -557,7 +557,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
                 *snap_hb, *snap_cb, *snap_sb, *snap_lb,
                 *promisc_cb,
                 *filter_hb, *filter_bt, *filter_te, *filter_cm,
-				
+
                 *file_fr, *file_vb,
                 *file_hb, *file_bt, *file_lb, *file_te,
                 *multi_tb, *multi_files_on_cb,
@@ -631,7 +631,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
   /* update airpcap interface list */
 
   /* load the airpcap interfaces */
-  airpcap_if_list = get_airpcap_interface_list(&err, err_str);
+  airpcap_if_list = get_airpcap_interface_list(&err, &err_str);
 
   decryption_cm = OBJECT_GET_DATA(airpcap_tb,AIRPCAP_TOOLBAR_DECRYPTION_KEY);
   update_decryption_mode_list(decryption_cm);
@@ -1403,7 +1403,7 @@ select_link_type_cb(GtkWidget *w, gpointer data)
   int new_linktype = GPOINTER_TO_INT(data);
   GtkWidget *linktype_om = OBJECT_GET_DATA(w, E_CAP_LT_OM_KEY);
   int old_linktype = GPOINTER_TO_INT(OBJECT_GET_DATA(linktype_om, E_CAP_OM_LT_VALUE_KEY));
-  
+
   /* If the link is changed, update the menu and store the index and the value
      to reuse later when the dialog window will be reopened */
   if (old_linktype != new_linktype) {
diff --git a/gtk/capture_if_dlg.c b/gtk/capture_if_dlg.c
index fdcd0c6068..ef5483ac8f 100644
--- a/gtk/capture_if_dlg.c
+++ b/gtk/capture_if_dlg.c
@@ -452,7 +452,7 @@ capture_if_cb(GtkWidget *w _U_, gpointer d _U_)
 
 #ifdef HAVE_AIRPCAP
   /* LOAD AIRPCAP INTERFACES */
-  airpcap_if_list = get_airpcap_interface_list(&err, err_str);
+  airpcap_if_list = get_airpcap_interface_list(&err, &err_str);
   if (airpcap_if_list == NULL)
     airpcap_if_active = airpcap_if_selected = NULL;
 
diff --git a/gtk/main.c b/gtk/main.c
index bfb442408f..c1cfb89975 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -2107,7 +2107,7 @@ main(int argc, char *argv[])
   int                  status;
 
 #ifdef HAVE_AIRPCAP
-  char			err_str[AIRPCAP_ERRBUF_SIZE];
+  char			*err_str;
   gchar			*cant_get_if_list_errstr;
 #endif
 
@@ -2164,7 +2164,7 @@ main(int argc, char *argv[])
   switch (airpcap_dll_ret_val) {
   case AIRPCAP_DLL_OK:
     /* load the airpcap interfaces */
-    airpcap_if_list = get_airpcap_interface_list(&err, err_str);
+    airpcap_if_list = get_airpcap_interface_list(&err, &err_str);
 
     if (airpcap_if_list == NULL && err == CANT_GET_AIRPCAP_INTERFACE_LIST) {
       simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", err_str);