summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2016-09-29 21:37:10 (GMT)
committer Vincent Sanders <vince@kyllikki.org>2016-09-29 21:37:10 (GMT)
commita2396edde4f9746cfeb416ece9e20916de3216a4 (patch)
tree40a35e448d014e3ab4a4f36bd7a41749145ea0d7
parent0dcfc2fc5dbc7b65cb0234dfbf340a22bd625638 (diff)
downloadnetsurf-a2396edde4f9746cfeb416ece9e20916de3216a4.tar.gz
netsurf-a2396edde4f9746cfeb416ece9e20916de3216a4.tar.bz2
complete transition to locale independant core operation
The netsurf core no longer uses any locale dependant operations excepting the mall number or cases where such operations are explicitly wanted. the netsurf_init now calls setlocale with the empty string and lets the c library setup as per its specific implementation. any core functionality that specificaly processes ascii text must use the utils/ascii.h header to do so.
-rw-r--r--desktop/netsurf.c3
-rw-r--r--frontends/riscos/wimp.c12
-rw-r--r--render/box_construct.c11
-rw-r--r--utils/Makefile1
-rw-r--r--utils/locale.c53
-rw-r--r--utils/locale.h42
6 files changed, 6 insertions, 116 deletions
diff --git a/desktop/netsurf.c b/desktop/netsurf.c
index f1daeab..d129ef7 100644
--- a/desktop/netsurf.c
+++ b/desktop/netsurf.c
@@ -212,12 +212,11 @@ nserror netsurf_init(const char *store_path)
if (ret != NSERROR_OK)
return ret;
-
ret = mimesniff_init();
if (ret != NSERROR_OK)
return ret;
- setlocale(LC_ALL, "C");
+ setlocale(LC_ALL, "");
/* initialise the fetchers */
ret = fetcher_init();
diff --git a/frontends/riscos/wimp.c b/frontends/riscos/wimp.c
index 2579c67..abf099a 100644
--- a/frontends/riscos/wimp.c
+++ b/frontends/riscos/wimp.c
@@ -360,12 +360,8 @@ void ro_gui_set_icon_integer(wimp_w w, wimp_i i, int value)
{
char buffer[20]; // Big enough for 64-bit int
- setlocale(LC_NUMERIC, "");
-
sprintf(buffer, "%d", value);
- setlocale(LC_NUMERIC, "C");
-
ro_gui_set_icon_string(w, i, buffer, true);
}
@@ -382,8 +378,6 @@ void ro_gui_set_icon_decimal(wimp_w w, wimp_i i, int value, int decimal_places)
{
char buffer[20]; // Big enough for 64-bit int
- setlocale(LC_NUMERIC, "");
-
switch (decimal_places) {
case 0:
sprintf(buffer, "%d", value);
@@ -399,8 +393,6 @@ void ro_gui_set_icon_decimal(wimp_w w, wimp_i i, int value, int decimal_places)
break;
}
- setlocale(LC_NUMERIC, "C");
-
ro_gui_set_icon_string(w, i, buffer, true);
}
@@ -421,12 +413,8 @@ int ro_gui_get_icon_decimal(wimp_w w, wimp_i i, int decimal_places)
for (; decimal_places > 0; decimal_places--)
multiple *= 10;
- setlocale(LC_NUMERIC, "");
-
value = atof(ro_gui_get_icon_string(w, i)) * multiple;
- setlocale(LC_NUMERIC, "C");
-
return (int)value;
}
diff --git a/render/box_construct.c b/render/box_construct.c
index f6f18ab..4b54a30 100644
--- a/render/box_construct.c
+++ b/render/box_construct.c
@@ -35,7 +35,6 @@
#include "utils/config.h"
#include "utils/nsoption.h"
#include "utils/corestrings.h"
-#include "utils/locale.h"
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/talloc.h"
@@ -1386,20 +1385,20 @@ void box_text_transform(char *s, unsigned int len, enum css_text_transform_e tt)
case CSS_TEXT_TRANSFORM_UPPERCASE:
for (i = 0; i < len; ++i)
if ((unsigned char) s[i] < 0x80)
- s[i] = ls_toupper(s[i]);
+ s[i] = toupper(s[i]);
break;
case CSS_TEXT_TRANSFORM_LOWERCASE:
for (i = 0; i < len; ++i)
if ((unsigned char) s[i] < 0x80)
- s[i] = ls_tolower(s[i]);
+ s[i] = tolower(s[i]);
break;
case CSS_TEXT_TRANSFORM_CAPITALIZE:
if ((unsigned char) s[0] < 0x80)
- s[0] = ls_toupper(s[0]);
+ s[0] = toupper(s[0]);
for (i = 1; i < len; ++i)
if ((unsigned char) s[i] < 0x80 &&
- ls_isspace(s[i - 1]))
- s[i] = ls_toupper(s[i]);
+ isspace(s[i - 1]))
+ s[i] = toupper(s[i]);
break;
default:
break;
diff --git a/utils/Makefile b/utils/Makefile
index b6eede4..5d9d9dc 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -10,7 +10,6 @@ S_UTILS := \
hashtable.c \
idna.c \
libdom.c \
- locale.c \
log.c \
messages.c \
nsoption.c \
diff --git a/utils/locale.c b/utils/locale.c
deleted file mode 100644
index 88509e4..0000000
--- a/utils/locale.c
+++ b/dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2008 John-Mark Bell <jmb@netsurf-browser.org>
- *
- * This file is part of NetSurf, http://www.netsurf-browser.org/
- *
- * NetSurf is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * NetSurf is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/** \file
- * Locale-specific variants of various routines (implementation)
- */
-
-#include <ctype.h>
-#include <locale.h>
-
-#include "utils/locale.h"
-
-/* <ctype.h> functions */
-#define MAKELSCTYPE(x) int ls_##x(int c) \
-{ \
- int ret; \
- setlocale(LC_ALL, ""); \
- ret = x(c); \
- setlocale(LC_ALL, "C"); \
- return ret; \
-}
-
-MAKELSCTYPE(isalpha)
-MAKELSCTYPE(isalnum)
-MAKELSCTYPE(iscntrl)
-MAKELSCTYPE(isdigit)
-MAKELSCTYPE(isgraph)
-MAKELSCTYPE(islower)
-MAKELSCTYPE(isprint)
-MAKELSCTYPE(ispunct)
-MAKELSCTYPE(isspace)
-MAKELSCTYPE(isupper)
-MAKELSCTYPE(isxdigit)
-MAKELSCTYPE(tolower)
-MAKELSCTYPE(toupper)
-
-#undef MAKELSCTYPE
-
diff --git a/utils/locale.h b/utils/locale.h
deleted file mode 100644
index ebe9a90..0000000
--- a/utils/locale.h
+++ b/dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2008 John-Mark Bell <jmb@netsurf-browser.org>
- *
- * This file is part of NetSurf, http://www.netsurf-browser.org/
- *
- * NetSurf is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * NetSurf is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/** \file
- * Locale-specific variants of various routines (interface)
- */
-
-#ifndef _NETSURF_UTILS_LOCALE_H_
-#define _NETSURF_UTILS_LOCALE_H_
-
-/* <ctype.h> functions */
-int ls_isalpha(int c);
-int ls_isalnum(int c);
-int ls_iscntrl(int c);
-int ls_isdigit(int c);
-int ls_isgraph(int c);
-int ls_islower(int c);
-int ls_isprint(int c);
-int ls_ispunct(int c);
-int ls_isspace(int c);
-int ls_isupper(int c);
-int ls_isxdigit(int c);
-int ls_tolower(int c);
-int ls_toupper(int c);
-
-#endif
-