Module Name: src
Committed By: joerg
Date: Sun Apr 14 23:30:16 UTC 2013
Modified Files:
src/include: locale.h
src/lib/libc/locale: current_locale.c dummy_lc_template.h
generic_lc_all.c generic_lc_template_decl.h global_locale.c
nb_lc_template.h setlocale.c setlocale_local.h
Log Message:
Rename struct _locale_impl_t to struct _locale, since it will end up as
locale_t later.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/include/locale.h
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/locale/current_locale.c \
src/lib/libc/locale/dummy_lc_template.h \
src/lib/libc/locale/generic_lc_template_decl.h
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/locale/generic_lc_all.c \
src/lib/libc/locale/nb_lc_template.h
cvs rdiff -u -r1.14 -r1.15 src/lib/libc/locale/global_locale.c
cvs rdiff -u -r1.60 -r1.61 src/lib/libc/locale/setlocale.c
cvs rdiff -u -r1.9 -r1.10 src/lib/libc/locale/setlocale_local.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/include/locale.h
diff -u src/include/locale.h:1.17 src/include/locale.h:1.18
--- src/include/locale.h:1.17 Mon Jun 7 13:52:29 2010
+++ src/include/locale.h Sun Apr 14 23:30:15 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: locale.h,v 1.17 2010/06/07 13:52:29 tnozaki Exp $ */
+/* $NetBSD: locale.h,v 1.18 2013/04/14 23:30:15 joerg Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -77,9 +77,9 @@ struct lconv {
#ifdef __SETLOCALE_SOURCE__
-typedef struct _locale_impl_t *_locale_t;
+typedef struct _locale *_locale_t;
-#define _LC_GLOBAL_LOCALE ((_locale_t)-1)
+#define _LC_GLOBAL_LOCALE ((_locale_t)-1)
#endif
Index: src/lib/libc/locale/current_locale.c
diff -u src/lib/libc/locale/current_locale.c:1.3 src/lib/libc/locale/current_locale.c:1.4
--- src/lib/libc/locale/current_locale.c:1.3 Tue Mar 20 17:44:18 2012
+++ src/lib/libc/locale/current_locale.c Sun Apr 14 23:30:16 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: current_locale.c,v 1.3 2012/03/20 17:44:18 matt Exp $ */
+/* $NetBSD: current_locale.c,v 1.4 2013/04/14 23:30:16 joerg Exp $ */
/*-
* Copyright (c)2008 Citrus Project,
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: current_locale.c,v 1.3 2012/03/20 17:44:18 matt Exp $");
+__RCSID("$NetBSD: current_locale.c,v 1.4 2013/04/14 23:30:16 joerg Exp $");
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
@@ -40,9 +40,9 @@ __RCSID("$NetBSD: current_locale.c,v 1.3
#include "setlocale_local.h"
-static struct _locale_impl_t *__current_locale = &_global_locale;
+static struct _locale *__current_locale = &_global_locale;
-struct _locale_impl_t **
+struct _locale **
_current_locale(void)
{
return &__current_locale;
Index: src/lib/libc/locale/dummy_lc_template.h
diff -u src/lib/libc/locale/dummy_lc_template.h:1.3 src/lib/libc/locale/dummy_lc_template.h:1.4
--- src/lib/libc/locale/dummy_lc_template.h:1.3 Sun Mar 4 21:14:56 2012
+++ src/lib/libc/locale/dummy_lc_template.h Sun Apr 14 23:30:16 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dummy_lc_template.h,v 1.3 2012/03/04 21:14:56 tnozaki Exp $ */
+/* $NetBSD: dummy_lc_template.h,v 1.4 2013/04/14 23:30:16 joerg Exp $ */
/*-
* Copyright (c)2008 Citrus Project,
@@ -33,7 +33,7 @@
const char *
_PREFIX(setlocale)(const char * __restrict name,
- struct _locale_impl_t * __restrict locale)
+ struct _locale * __restrict locale)
{
if (name != NULL) {
if (*name == '\0')
Index: src/lib/libc/locale/generic_lc_template_decl.h
diff -u src/lib/libc/locale/generic_lc_template_decl.h:1.3 src/lib/libc/locale/generic_lc_template_decl.h:1.4
--- src/lib/libc/locale/generic_lc_template_decl.h:1.3 Sun Mar 4 21:14:56 2012
+++ src/lib/libc/locale/generic_lc_template_decl.h Sun Apr 14 23:30:16 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: generic_lc_template_decl.h,v 1.3 2012/03/04 21:14:56 tnozaki Exp $ */
+/* $NetBSD: generic_lc_template_decl.h,v 1.4 2013/04/14 23:30:16 joerg Exp $ */
/*-
* Copyright (c)2008 Citrus Project,
@@ -30,6 +30,6 @@
#define _GENERIC_LC_TEMPLATE_DECL_H_
const char * _PREFIX(setlocale)(const char * __restrict,
- struct _locale_impl_t * __restrict);
+ struct _locale * __restrict);
#endif /*_GENERIC_LC_TEMPLATE_DECL_H_*/
Index: src/lib/libc/locale/generic_lc_all.c
diff -u src/lib/libc/locale/generic_lc_all.c:1.4 src/lib/libc/locale/generic_lc_all.c:1.5
--- src/lib/libc/locale/generic_lc_all.c:1.4 Sun Mar 4 21:14:56 2012
+++ src/lib/libc/locale/generic_lc_all.c Sun Apr 14 23:30:16 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: generic_lc_all.c,v 1.4 2012/03/04 21:14:56 tnozaki Exp $ */
+/* $NetBSD: generic_lc_all.c,v 1.5 2013/04/14 23:30:16 joerg Exp $ */
/*-
* Copyright (c)2008 Citrus Project,
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: generic_lc_all.c,v 1.4 2012/03/04 21:14:56 tnozaki Exp $");
+__RCSID("$NetBSD: generic_lc_all.c,v 1.5 2013/04/14 23:30:16 joerg Exp $");
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@@ -51,7 +51,7 @@ __RCSID("$NetBSD: generic_lc_all.c,v 1.4
const char *
_generic_LC_ALL_setlocale(const char * __restrict name,
- struct _locale_impl_t * __restrict locale)
+ struct _locale * __restrict locale)
{
_locale_set_t sl;
char head[_LOCALENAME_LEN_MAX * (_LC_LAST - 1)], *tail;
Index: src/lib/libc/locale/nb_lc_template.h
diff -u src/lib/libc/locale/nb_lc_template.h:1.4 src/lib/libc/locale/nb_lc_template.h:1.5
--- src/lib/libc/locale/nb_lc_template.h:1.4 Sun Mar 4 21:14:56 2012
+++ src/lib/libc/locale/nb_lc_template.h Sun Apr 14 23:30:16 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: nb_lc_template.h,v 1.4 2012/03/04 21:14:56 tnozaki Exp $ */
+/* $NetBSD: nb_lc_template.h,v 1.5 2013/04/14 23:30:16 joerg Exp $ */
/*-
* Copyright (c)1999, 2008 Citrus Project,
@@ -216,7 +216,7 @@ done:
const char *
_PREFIX(setlocale)(const char * __restrict name,
- struct _locale_impl_t * __restrict locale)
+ struct _locale * __restrict locale)
{
_nb_part_t *part;
Index: src/lib/libc/locale/global_locale.c
diff -u src/lib/libc/locale/global_locale.c:1.14 src/lib/libc/locale/global_locale.c:1.15
--- src/lib/libc/locale/global_locale.c:1.14 Sat Apr 13 10:21:20 2013
+++ src/lib/libc/locale/global_locale.c Sun Apr 14 23:30:16 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: global_locale.c,v 1.14 2013/04/13 10:21:20 joerg Exp $ */
+/* $NetBSD: global_locale.c,v 1.15 2013/04/14 23:30:16 joerg Exp $ */
/*-
* Copyright (c)2008 Citrus Project,
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: global_locale.c,v 1.14 2013/04/13 10:21:20 joerg Exp $");
+__RCSID("$NetBSD: global_locale.c,v 1.15 2013/04/14 23:30:16 joerg Exp $");
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@@ -147,7 +147,7 @@ static struct _locale_cache_t _global_ca
#endif
};
-struct _locale_impl_t _global_locale = {
+struct _locale _global_locale = {
.cache = &_global_cache,
.query = { _C_LOCALE },
.part_name = {
Index: src/lib/libc/locale/setlocale.c
diff -u src/lib/libc/locale/setlocale.c:1.60 src/lib/libc/locale/setlocale.c:1.61
--- src/lib/libc/locale/setlocale.c:1.60 Sun Mar 4 21:14:56 2012
+++ src/lib/libc/locale/setlocale.c Sun Apr 14 23:30:16 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: setlocale.c,v 1.60 2012/03/04 21:14:56 tnozaki Exp $ */
+/* $NetBSD: setlocale.c,v 1.61 2013/04/14 23:30:16 joerg Exp $ */
/*-
* Copyright (c)2008 Citrus Project,
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: setlocale.c,v 1.60 2012/03/04 21:14:56 tnozaki Exp $");
+__RCSID("$NetBSD: setlocale.c,v 1.61 2013/04/14 23:30:16 joerg Exp $");
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@@ -86,7 +86,7 @@ char *
__setlocale(int category, const char *name)
{
_locale_set_t sl;
- struct _locale_impl_t *impl;
+ struct _locale *impl;
sl = _find_category(category);
if (sl == NULL)
Index: src/lib/libc/locale/setlocale_local.h
diff -u src/lib/libc/locale/setlocale_local.h:1.9 src/lib/libc/locale/setlocale_local.h:1.10
--- src/lib/libc/locale/setlocale_local.h:1.9 Sat Apr 13 10:21:21 2013
+++ src/lib/libc/locale/setlocale_local.h Sun Apr 14 23:30:16 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: setlocale_local.h,v 1.9 2013/04/13 10:21:21 joerg Exp $ */
+/* $NetBSD: setlocale_local.h,v 1.10 2013/04/14 23:30:16 joerg Exp $ */
/*-
* Copyright (c)2008 Citrus Project,
@@ -53,7 +53,7 @@ struct _locale_cache_t {
#endif
};
-struct _locale_impl_t {
+struct _locale {
struct _locale_cache_t *cache;
char query[_LOCALENAME_LEN_MAX * (_LC_LAST - 1)];
const char *part_name[_LC_LAST];
@@ -61,28 +61,28 @@ struct _locale_impl_t {
};
typedef const char *(*_locale_set_t)(const char * __restrict,
- struct _locale_impl_t * __restrict);
+ struct _locale * __restrict);
__BEGIN_DECLS
_locale_set_t _find_category(int);
const char *_get_locale_env(const char *);
-struct _locale_impl_t **_current_locale(void);
+struct _locale **_current_locale(void);
char *__setlocale(int, const char *);
const char *_generic_LC_ALL_setlocale(
- const char * __restrict, struct _locale_impl_t * __restrict);
+ const char * __restrict, struct _locale * __restrict);
const char *_dummy_LC_COLLATE_setlocale(
- const char * __restrict, struct _locale_impl_t * __restrict);
+ const char * __restrict, struct _locale * __restrict);
const char *_citrus_LC_CTYPE_setlocale(
- const char * __restrict, struct _locale_impl_t * __restrict);
+ const char * __restrict, struct _locale * __restrict);
const char *_citrus_LC_MONETARY_setlocale(
- const char * __restrict, struct _locale_impl_t * __restrict);
+ const char * __restrict, struct _locale * __restrict);
const char *_citrus_LC_NUMERIC_setlocale(
- const char * __restrict, struct _locale_impl_t * __restrict);
+ const char * __restrict, struct _locale * __restrict);
const char *_citrus_LC_TIME_setlocale(
- const char * __restrict, struct _locale_impl_t * __restrict);
+ const char * __restrict, struct _locale * __restrict);
const char *_citrus_LC_MESSAGES_setlocale(
- const char * __restrict, struct _locale_impl_t * __restrict);
+ const char * __restrict, struct _locale * __restrict);
__END_DECLS
static __inline struct _locale_cache_t *
@@ -91,7 +91,7 @@ _current_cache(void)
return (*_current_locale())->cache;
}
-extern struct _locale_impl_t _global_locale;
+extern struct _locale _global_locale;
extern size_t __mb_len_max_runtime;
#endif /*_SETLOCALE_LOCAL_H_*/
