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 /randpkt.c | |
parent | 058fc19f453cc7445a62036a29bc69938ceb1a2a (diff) |
Move the Windows argument list conversion code to a common routine.
svn path=/trunk/; revision=37372
Diffstat (limited to 'randpkt.c')
-rw-r--r-- | randpkt.c | 17 |
1 files changed, 2 insertions, 15 deletions
@@ -51,8 +51,7 @@ #include "wiretap/wtap.h" #ifdef _WIN32 -#include <windows.h> -#include <shellapi.h> +#include <wsutil/unicode-utils.h> #endif /* _WIN32 */ #define array_length(x) (sizeof x / sizeof x[0]) @@ -508,12 +507,6 @@ main(int argc, char **argv) int opt; -#ifdef _WIN32 - LPWSTR *wc_argv; - int wc_argc; -#endif /* _WIN32 */ - - int produce_count = 1000; /* number of pkts to produce */ int produce_type = PKT_ETHERNET; char *produce_filename = NULL; @@ -521,13 +514,7 @@ main(int argc, char **argv) pkt_example *example; #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 */ while ((opt = getopt(argc, argv, "b:c:ht:")) != -1) { |