diff options
| author | Guy Harris <guy@alum.mit.edu> | 2012-11-23 22:28:06 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2012-11-23 22:28:06 +0000 |
| commit | 7ed474bc27a468967bac44845116dc3ccde4d08b (patch) | |
| tree | eaf89d5aaea20c25a6bfe07ed03b6bdd57057f9f /capture-wpcap.c | |
| parent | 6b97dfbfa7a1e93e4cc5f1616feadef5f6fd8dfe (diff) | |
Hoist all the friendly-name/vendor-description stuff up into
if_info_new().
svn path=/trunk/; revision=46159
Diffstat (limited to 'capture-wpcap.c')
| -rw-r--r-- | capture-wpcap.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/capture-wpcap.c b/capture-wpcap.c index 02f9a591fc..ea5f4f5aef 100644 --- a/capture-wpcap.c +++ b/capture-wpcap.c @@ -35,7 +35,6 @@ #include "capture_ifinfo.h" #include "capture-pcap-util.h" #include "capture-pcap-util-int.h" -#include "capture_win_ifnames.h" #include "capture-wpcap.h" #include <wsutil/file_util.h> @@ -723,7 +722,6 @@ get_interface_list(int *err, char **err_str) char ascii_desc[MAX_WIN_IF_NAME_LEN + 1]; int i, j; char errbuf[PCAP_ERRBUF_SIZE]; - char *friendly_name; if (!has_wpcap) { /* @@ -825,10 +823,8 @@ get_interface_list(int *err, char **err_str) } ascii_name[j] = '\0'; i++; - get_windows_interface_friendlyname(ascii_name, &friendly_name); il = g_list_append(il, - if_info_new(ascii_name, friendly_name, ascii_desc, FALSE)); - g_free(friendly_name); + if_info_new(ascii_name, ascii_desc, FALSE)); } } else { /* @@ -847,10 +843,8 @@ get_interface_list(int *err, char **err_str) * interface name, and "desc" points to * that interface's description. */ - get_windows_interface_friendlyname(&win95names[i], &friendly_name); il = g_list_append(il, - if_info_new(&win95names[i], friendly_name, desc, FALSE)); - g_free(friendly_name); + if_info_new(&win95names[i], desc, FALSE)); /* * Skip to the next description. |