summaryrefslogtreecommitdiff
path: root/tfshark.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2014-12-31 16:46:50 -0800
committerGuy Harris <guy@alum.mit.edu>2015-01-01 00:47:17 +0000
commit114e7735b961720e63d2145770ed9b82c0200ff8 (patch)
treef17269993b85673cef4e7ca9f00b4ee5975c77dc /tfshark.c
parenta53b67ceb7c1e4b1d53a4853d37386a483cc9ab0 (diff)
downloadwireshark-114e7735b961720e63d2145770ed9b82c0200ff8.tar.gz
Call setlocale() before getting version information.
That way, the setlocale() call used to get the current locale will get the right answer. Change-Id: Ib43e16a9d98d08e5ddaff81fd3235f5b64d7b95b Reviewed-on: https://code.wireshark.org/review/6197 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'tfshark.c')
-rw-r--r--tfshark.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/tfshark.c b/tfshark.c
index b0fd8aa553..8b1b43a23f 100644
--- a/tfshark.c
+++ b/tfshark.c
@@ -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) {