Page MenuHomeFreeBSD
Files F168180096

D34140.id.diff
No OneTemporary
Actions

D34140.id.diff
View Options

diff --git a/lib/libc/locale/xlocale.c b/lib/libc/locale/xlocale.c
--- a/lib/libc/locale/xlocale.c
+++ b/lib/libc/locale/xlocale.c
@@ -64,13 +64,12 @@
* Flag indicating that one or more per-thread locales exist.
*/
int __has_thread_locale;
+
/*
* Private functions in setlocale.c.
*/
-const char *
-__get_locale_env(int category);
-int
-__detect_path_locale(void);
+const char *__get_locale_env(int category);
+int __detect_path_locale(void);
struct _xlocale __xlocale_global_locale = {
{0},
@@ -101,7 +100,7 @@
0
};
-static void*(*constructors[])(const char*, locale_t) =
+static void *(*constructors[])(const char *, locale_t) =
{
__collate_load,
__ctype_load,
@@ -115,7 +114,8 @@
static int fake_tls;
static locale_t thread_local_locale;
-static void init_key(void)
+static void
+init_key(void)
{
pthread_key_create(&locale_info_key, xlocale_release);
@@ -139,7 +139,7 @@
_once(&once_control, init_key);
return (fake_tls ? thread_local_locale :
- pthread_getspecific(locale_info_key));
+ pthread_getspecific(locale_info_key));
}
static void
@@ -198,6 +198,7 @@
new->numeric_locale_changed = 1;
return (new);
}
+
static void
copyflags(locale_t new, locale_t old)
{
@@ -207,7 +208,8 @@
new->using_messages_locale = old->using_messages_locale;
}
-static int dupcomponent(int type, locale_t base, locale_t new)
+static int
+dupcomponent(int type, locale_t base, locale_t new)
{
/* Always copy from the global locale, since it has mutable components.
*/
@@ -238,7 +240,8 @@
* xlocale interface.
*/
-locale_t newlocale(int mask, const char *locale, locale_t base)
+locale_t
+newlocale(int mask, const char *locale, locale_t base)
{
locale_t orig_base;
int type;
@@ -295,7 +298,8 @@
return (new);
}
-locale_t duplocale(locale_t base)
+locale_t
+duplocale(locale_t base)
{
locale_t new = alloc_locale();
int type;
@@ -338,7 +342,8 @@
* Returns the name or version of the locale for a particular component of a
* locale_t.
*/
-const char *querylocale(int mask, locale_t loc)
+const char *
+querylocale(int mask, locale_t loc)
{
int type = ffs(mask & ~LC_VERSION_MASK) - 1;
FIX_LOCALE(loc);
@@ -358,7 +363,8 @@
/*
* Installs the specified locale_t as this thread's locale.
*/
-locale_t uselocale(locale_t loc)
+locale_t
+uselocale(locale_t loc)
{
locale_t old = get_thread_locale();
if (NULL != loc) {

File Metadata

Mime Type
text/plain
Expires
Thu, Aug 27, 6:04 PM (5 h, 38 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37407716
Default Alt Text
D34140.id.diff (2 KB)

Event Timeline