diff options
author | Remi Collet <fedora@famillecollet.com> | 2012-12-13 09:47:33 +0100 |
---|---|---|
committer | Remi Collet <fedora@famillecollet.com> | 2012-12-13 09:47:33 +0100 |
commit | a01b659ace168d85a3e9e47848eaaba2bea31078 (patch) | |
tree | f2c68350ea09f440e921b04a513de523e5050e90 /json_util.c | |
parent | 16a4a32e294e80ca8c89ec83e62baa0c59947ac9 (diff) | |
download | json-c-a01b659ace168d85a3e9e47848eaaba2bea31078.tar.gz |
move locale change to be global for perf
Diffstat (limited to 'json_util.c')
-rw-r--r-- | json_util.c | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/json_util.c b/json_util.c index c144059..0a59811 100644 --- a/json_util.c +++ b/json_util.c @@ -36,10 +36,6 @@ # include <unistd.h> #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_LOCALE_H -#include <locale.h> -#endif /* HAVE_LOCALE_H */ - #ifdef WIN32 # define WIN32_LEAN_AND_MEAN # include <windows.h> @@ -148,23 +144,7 @@ int json_object_to_file(char *filename, struct json_object *obj) int json_parse_double(const char *buf, double *retval) { - int ret; -#ifdef HAVE_SETLOCALE - char *old=NULL, *tmp; - - tmp = setlocale(LC_NUMERIC, NULL); - if (tmp) old = strdup(tmp); - setlocale(LC_NUMERIC, "C"); -#endif - - ret = sscanf(buf, "%lf", retval); - -#ifdef HAVE_SETLOCALE - setlocale(LC_NUMERIC, old); - if (old) free(old); -#endif - - return (ret==1 ? 0 : 1); + return (sscanf(buf, "%lf", retval)==1 ? 0 : 1); } int json_parse_int64(const char *buf, int64_t *retval) |