Move the Windows argument list conversion code to a common routine.

svn path=/trunk/; revision=37372

1 files changed, 1 insertions, 10 deletions

diff --git a/dumpcap.c b/dumpcap.c
index 17946b6d12..c83a39bc99 100644
--- a/dumpcap.c
+++ b/dumpcap.c
@@ -85,7 +85,6 @@
 #include "pcapio.h"
 
 #ifdef _WIN32
-#include <shellapi.h>
 #include "capture-wpcap.h"
 #include <wsutil/unicode-utils.h>
 #endif
@@ -3645,8 +3644,6 @@ main(int argc, char *argv[])
 
 #ifdef _WIN32
     WSADATA              wsaData;
-    LPWSTR              *wc_argv;
-    int                  wc_argc;
 #else
     struct sigaction action, oldaction;
 #endif
@@ -3670,13 +3667,7 @@ main(int argc, char *argv[])
 #endif
 
 #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 */
 
 #ifdef _WIN32