summaryrefslogtreecommitdiff
path: root/ui
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2012-11-24 00:05:32 +0000
committerGuy Harris <guy@alum.mit.edu>2012-11-24 00:05:32 +0000
commit5290b60ab3b83ca3d5e16210c01393b31bab6815 (patch)
tree7bde4c59ea4b36db5ac238b75fccb3ad15bdd916 /ui
parentbc5d30c8200e72fc0b3be7c908c9c225736a4920 (diff)
downloadwireshark-5290b60ab3b83ca3d5e16210c01393b31bab6815.tar.gz
Rename get_windows_interface_friendlyname() to
get_windows_interface_friendly_name(), and have it return the friendly name on success and NULL on failure. Get rid of the logging in get_windows_interface_friendly_name(). svn path=/trunk/; revision=46161
Diffstat (limited to 'ui')
-rw-r--r--ui/gtk/capture_if_details_dlg_win32.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/ui/gtk/capture_if_details_dlg_win32.c b/ui/gtk/capture_if_details_dlg_win32.c
index f3886115fb..6f6988e2dc 100644
--- a/ui/gtk/capture_if_details_dlg_win32.c
+++ b/ui/gtk/capture_if_details_dlg_win32.c
@@ -1779,7 +1779,7 @@ capture_if_details_task_offload(GtkWidget *table, GtkWidget *main_vb, guint *row
static int
capture_if_details_general(GtkWidget *table, GtkWidget *main_vb, guint *row, LPADAPTER adapter, gchar *iface) {
- gchar *interface_friendlyname;
+ gchar *interface_friendly_name;
gchar string_buff[DETAILS_STR_MAX];
const gchar *manuf_name;
unsigned int uint_value;
@@ -1800,10 +1800,10 @@ capture_if_details_general(GtkWidget *table, GtkWidget *main_vb, guint *row, LPA
add_string_to_table(table, row, "Characteristics", "");
/* OS friendly name - look it up from iface ("\Device\NPF_{11111111-2222-3333-4444-555555555555}") */
- get_windows_interface_friendlyname(/* IN */ iface, /* OUT */&interface_friendlyname);
- if(interface_friendlyname!=NULL){
- add_string_to_table(table, row, "OS Friendly name", interface_friendlyname);
- g_free(interface_friendlyname);
+ interface_friendly_name = get_windows_interface_friendly_name(/* IN */ iface);
+ if(interface_friendly_name!=NULL){
+ add_string_to_table(table, row, "OS Friendly name", interface_friendly_name);
+ g_free(interface_friendly_name);
}
/* Vendor description */