diff options
| author | Gerald Combs <gerald@wireshark.org> | 2011-05-24 00:07:56 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2011-05-24 00:07:56 +0000 |
| commit | a24687ce8eba24d3065bd38c139abfd7720fbb7b (patch) | |
| tree | df105f49b2895d2f74db9545ae4235aba0e95562 /mergecap.c | |
| parent | 058fc19f453cc7445a62036a29bc69938ceb1a2a (diff) | |
| download | wireshark-a24687ce8eba24d3065bd38c139abfd7720fbb7b.tar.gz | |
Move the Windows argument list conversion code to a common routine.
svn path=/trunk/; revision=37372
Diffstat (limited to 'mergecap.c')
| -rw-r--r-- | mergecap.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/mergecap.c b/mergecap.c index 460f938ba9..9c658cb433 100644 --- a/mergecap.c +++ b/mergecap.c @@ -42,8 +42,7 @@ #endif #ifdef _WIN32 -#include <windows.h> -#include <shellapi.h> +#include <wsutil/unicode-utils.h> #endif /* _WIN32 */ static int @@ -149,11 +148,6 @@ main(int argc, char *argv[]) { int opt; -#ifdef _WIN32 - LPWSTR *wc_argv; - int wc_argc; -#endif /* _WIN32 */ - gboolean do_append = FALSE; gboolean verbose = FALSE; int in_file_count = 0; @@ -174,13 +168,7 @@ main(int argc, char *argv[]) int count; #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 */ /* Process the options first */ |