summaryrefslogtreecommitdiff
path: root/capture.c
diff options
context:
space:
mode:
authorStig Bjørlykke <stig@bjorlykke.org>2008-06-02 17:17:24 +0000
committerStig Bjørlykke <stig@bjorlykke.org>2008-06-02 17:17:24 +0000
commitd623efba636b2939306d7059e03b1aaa2f10d80e (patch)
tree680c8b9ffee0b25418eae359cd046262a5ea0be8 /capture.c
parentd58dd2088f57e06a65a7482b48726e291350e0da (diff)
downloadwireshark-d623efba636b2939306d7059e03b1aaa2f10d80e.tar.gz
Don't include \r in linktype on win32, it looks weird in the combo box.
svn path=/trunk/; revision=25410
Diffstat (limited to 'capture.c')
-rw-r--r--capture.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/capture.c b/capture.c
index 27e661b53b..9148301c57 100644
--- a/capture.c
+++ b/capture.c
@@ -634,7 +634,11 @@ capture_interface_list(int *err, char **err_str)
}
/* Split our lines */
+#ifdef _WIN32
+ raw_list = g_strsplit(msg, "\r\n", 0);
+#else
raw_list = g_strsplit(msg, "\n", 0);
+#endif
g_free(msg);
for (i = 0; raw_list[i] != NULL; i++) {
@@ -717,7 +721,11 @@ capture_pcap_linktype_list(const gchar *ifname, char **err_str)
}
/* Split our lines */
+#ifdef _WIN32
+ raw_list = g_strsplit(msg, "\r\n", 0);
+#else
raw_list = g_strsplit(msg, "\n", 0);
+#endif
g_free(msg);
for (i = 0; raw_list[i] != NULL; i++) {