diff options
Diffstat (limited to 'capinfos.c')
| -rw-r--r-- | capinfos.c | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/capinfos.c b/capinfos.c index ddcf1f5633..0b06e42207 100644 --- a/capinfos.c +++ b/capinfos.c @@ -63,6 +63,7 @@ #include <wsutil/crash_info.h> #include <wsutil/filesystem.h> #include <wsutil/privileges.h> +#include <cli_main.h> #include <version_info.h> #include <wiretap/wtap_opttypes.h> @@ -80,10 +81,6 @@ #include "wsutil/wsgetopt.h" #endif -#ifdef _WIN32 -#include <wsutil/unicode-utils.h> -#endif /* _WIN32 */ - #include "ui/failure_message.h" #define INVALID_OPTION 1 @@ -1403,7 +1400,7 @@ hash_to_str(const unsigned char *hash, size_t length, char *str) { } } -static int +int real_main(int argc, char *argv[]) { GString *comp_info_str; @@ -1730,23 +1727,6 @@ exit: return overall_error_status; } -#ifdef _WIN32 -int -wmain(int argc, wchar_t *wc_argv[]) -{ - char **argv; - - argv = arg_list_utf_16to8(argc, wc_argv); - return real_main(argc, argv); -} -#else -int -main(int argc, char *argv[]) -{ - return real_main(argc, argv); -} -#endif - /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * |