summaryrefslogtreecommitdiff
path: root/rawshark.c
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2011-05-24 00:07:56 +0000
committerGerald Combs <gerald@wireshark.org>2011-05-24 00:07:56 +0000
commita24687ce8eba24d3065bd38c139abfd7720fbb7b (patch)
treedf105f49b2895d2f74db9545ae4235aba0e95562 /rawshark.c
parent058fc19f453cc7445a62036a29bc69938ceb1a2a (diff)
downloadwireshark-a24687ce8eba24d3065bd38c139abfd7720fbb7b.tar.gz
Move the Windows argument list conversion code to a common routine.
svn path=/trunk/; revision=37372
Diffstat (limited to 'rawshark.c')
-rw-r--r--rawshark.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/rawshark.c b/rawshark.c
index 58c31ff172..3d90e32679 100644
--- a/rawshark.c
+++ b/rawshark.c
@@ -118,7 +118,7 @@
#include "log.h"
#ifdef _WIN32
-#include <shellapi.h>
+#include <wsutil/unicode-utils.h>
#endif /* _WIN32 */
/*
@@ -435,8 +435,6 @@ main(int argc, char *argv[])
#ifdef _WIN32
WSADATA wsaData;
- LPWSTR *wc_argv;
- int wc_argc;
#endif /* _WIN32 */
char *gpf_path, *pf_path;
@@ -460,13 +458,7 @@ main(int argc, char *argv[])
static const char optstring[] = OPTSTRING_INIT;
#ifdef _WIN32
- /* Convert our arg list to UTF-8. */
- wc_argv = CommandLineToArgvW(GetCommandLineW(), &wc_argc);
- if (wc_argv && wc_argc == argc) {
- for (i = 0; i < argc; i++) {
- argv[i] = g_utf16_to_utf8(wc_argv[i], -1, NULL, NULL, NULL);
- }
- } /* XXX else bail because something is horribly, horribly wrong? */
+ arg_list_utf_16to8(argc, argv);
#endif /* _WIN32 */
/*