diff options
-rw-r--r-- | capinfos.c | 6 | ||||
-rw-r--r-- | captype.c | 6 | ||||
-rw-r--r-- | rawshark.c | 6 | ||||
-rw-r--r-- | tfshark.c | 6 | ||||
-rw-r--r-- | tshark.c | 6 |
5 files changed, 15 insertions, 15 deletions
diff --git a/capinfos.c b/capinfos.c index 9d4c2ebebe..083a010a09 100644 --- a/capinfos.c +++ b/capinfos.c @@ -1135,6 +1135,9 @@ main(int argc, char *argv[]) size_t hash_bytes; #endif + /* Set the C-language locale to the native environment. */ + setlocale(LC_ALL, ""); + /* Get the compile-time version information string */ comp_info_str = get_compiled_version_info(NULL, get_capinfos_compiled_info); @@ -1402,9 +1405,6 @@ main(int argc, char *argv[]) } } - /* Set the C-language locale to the native environment. */ - setlocale(LC_ALL, ""); - if ((argc - optind) < 1) { print_usage(stderr); exit(1); @@ -139,6 +139,9 @@ main(int argc, char *argv[]) char *init_progfile_dir_error; #endif + /* Set the C-language locale to the native environment. */ + setlocale(LC_ALL, ""); + /* Get the compile-time version information string */ comp_info_str = get_compiled_version_info(NULL, get_captype_compiled_info); @@ -211,9 +214,6 @@ main(int argc, char *argv[]) } } - /* Set the C-language locale to the native environment. */ - setlocale(LC_ALL, ""); - if (argc < 2) { print_usage(stderr); return 1; diff --git a/rawshark.c b/rawshark.c index 8859054053..5bbdaa04d9 100644 --- a/rawshark.c +++ b/rawshark.c @@ -450,6 +450,9 @@ main(int argc, char *argv[]) static const char optstring[] = OPTSTRING_INIT; + /* Set the C-language locale to the native environment. */ + setlocale(LC_ALL, ""); + cmdarg_err_init(rawshark_cmdarg_err, rawshark_cmdarg_err_cont); /* Get the compile-time version information string */ @@ -530,9 +533,6 @@ main(int argc, char *argv[]) case any dissectors register preferences. */ epan_init(register_all_protocols, register_all_protocol_handoffs, NULL, NULL); - /* Set the C-language locale to the native environment. */ - setlocale(LC_ALL, ""); - prefs_p = read_prefs(&gpf_open_errno, &gpf_read_errno, &gpf_path, &pf_open_errno, &pf_read_errno, &pf_path); if (gpf_path != NULL) { @@ -814,6 +814,9 @@ main(int argc, char *argv[]) static const char optstring[] = OPTSTRING; + /* Set the C-language locale to the native environment. */ + setlocale(LC_ALL, ""); + cmdarg_err_init(failure_message, failure_message_cont); #ifdef _WIN32 @@ -1029,9 +1032,6 @@ main(int argc, char *argv[]) return 0; } - /* Set the C-language locale to the native environment. */ - setlocale(LC_ALL, ""); - prefs_p = read_prefs(&gpf_open_errno, &gpf_read_errno, &gpf_path, &pf_open_errno, &pf_read_errno, &pf_path); if (gpf_path != NULL) { @@ -1016,6 +1016,9 @@ main(int argc, char *argv[]) static const char optstring[] = OPTSTRING; + /* Set the C-language locale to the native environment. */ + setlocale(LC_ALL, ""); + cmdarg_err_init(failure_message, failure_message_cont); #ifdef _WIN32 @@ -1261,9 +1264,6 @@ main(int argc, char *argv[]) return 0; } - /* Set the C-language locale to the native environment. */ - setlocale(LC_ALL, ""); - prefs_p = read_prefs(&gpf_open_errno, &gpf_read_errno, &gpf_path, &pf_open_errno, &pf_read_errno, &pf_path); if (gpf_path != NULL) { |