Add svn:eol-style.

[metze/wireshark/wip.git] / capture-wpcap.c

diff --git a/capture-wpcap.c b/capture-wpcap.c
index 02f9a591fc94742227a816fa2d751e7eb3dbf7a2..9bbfb968a429d69fab0964db0ca40fefc7048e5f 100644 (file)
--- 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>
@@ -128,7 +127,7 @@ typedef struct {
        gboolean        optional;
 } symbol_table_t;
 
-#define SYM(x, y)      { STRINGIFY(x) , (gpointer) &CONCAT(p_,x), y }
+#define SYM(x, y)      { G_STRINGIFY(x) , (gpointer) &CONCAT(p_,x), y }
 
 void
 load_wpcap(void)
@@ -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.
@@ -909,7 +903,7 @@ cant_get_if_list_error_message(const char *err_str)
 void
 get_compiled_pcap_version(GString *str)
 {
-       g_string_append(str, "with WinPcap (" STRINGIFY(PCAP_VERSION) ")");
+       g_string_append(str, "with WinPcap (" G_STRINGIFY(PCAP_VERSION) ")");
 }
 
 /*