[src/trunk]: src Rename struct _locale_impl_t to struct _locale, since it wil...

[joerg <joerg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0b81991c631f
branches:  trunk
changeset: 786095:0b81991c631f
user:      joerg <joerg%NetBSD.org@localhost>
date:      Sun Apr 14 23:30:15 2013 +0000

description:
Rename struct _locale_impl_t to struct _locale, since it will end up as
locale_t later.

diffstat:

 include/locale.h                           |   6 +++---
 lib/libc/locale/current_locale.c           |   8 ++++----
 lib/libc/locale/dummy_lc_template.h        |   4 ++--
 lib/libc/locale/generic_lc_all.c           |   6 +++---
 lib/libc/locale/generic_lc_template_decl.h |   4 ++--
 lib/libc/locale/global_locale.c            |   6 +++---
 lib/libc/locale/nb_lc_template.h           |   4 ++--
 lib/libc/locale/setlocale.c                |   6 +++---
 lib/libc/locale/setlocale_local.h          |  24 ++++++++++++------------
 9 files changed, 34 insertions(+), 34 deletions(-)

diffs (250 lines):

diff -r 48ecb965da08 -r 0b81991c631f include/locale.h
--- a/include/locale.h  Sun Apr 14 22:48:22 2013 +0000
+++ b/include/locale.h  Sun Apr 14 23:30:15 2013 +0000
@@ -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 @@
 
 #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
 
diff -r 48ecb965da08 -r 0b81991c631f lib/libc/locale/current_locale.c
--- a/lib/libc/locale/current_locale.c  Sun Apr 14 22:48:22 2013 +0000
+++ b/lib/libc/locale/current_locale.c  Sun Apr 14 23:30:15 2013 +0000
@@ -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 @@
 
 #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;
diff -r 48ecb965da08 -r 0b81991c631f lib/libc/locale/dummy_lc_template.h
--- a/lib/libc/locale/dummy_lc_template.h       Sun Apr 14 22:48:22 2013 +0000
+++ b/lib/libc/locale/dummy_lc_template.h       Sun Apr 14 23:30:15 2013 +0000
@@ -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')
diff -r 48ecb965da08 -r 0b81991c631f lib/libc/locale/generic_lc_all.c
--- a/lib/libc/locale/generic_lc_all.c  Sun Apr 14 22:48:22 2013 +0000
+++ b/lib/libc/locale/generic_lc_all.c  Sun Apr 14 23:30:15 2013 +0000
@@ -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 @@
 
 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;
diff -r 48ecb965da08 -r 0b81991c631f lib/libc/locale/generic_lc_template_decl.h
--- a/lib/libc/locale/generic_lc_template_decl.h        Sun Apr 14 22:48:22 2013 +0000
+++ b/lib/libc/locale/generic_lc_template_decl.h        Sun Apr 14 23:30:15 2013 +0000
@@ -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_*/
diff -r 48ecb965da08 -r 0b81991c631f lib/libc/locale/global_locale.c
--- a/lib/libc/locale/global_locale.c   Sun Apr 14 22:48:22 2013 +0000
+++ b/lib/libc/locale/global_locale.c   Sun Apr 14 23:30:15 2013 +0000
@@ -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 @@
 #endif
 };
 
-struct _locale_impl_t _global_locale = {
+struct _locale _global_locale = {
     .cache = &_global_cache,
     .query = { _C_LOCALE },
     .part_name = {
diff -r 48ecb965da08 -r 0b81991c631f lib/libc/locale/nb_lc_template.h
--- a/lib/libc/locale/nb_lc_template.h  Sun Apr 14 22:48:22 2013 +0000
+++ b/lib/libc/locale/nb_lc_template.h  Sun Apr 14 23:30:15 2013 +0000
@@ -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 @@
 
 const char *
 _PREFIX(setlocale)(const char * __restrict name,
-    struct _locale_impl_t * __restrict locale)
+    struct _locale * __restrict locale)
 {
        _nb_part_t *part;
 
diff -r 48ecb965da08 -r 0b81991c631f lib/libc/locale/setlocale.c
--- a/lib/libc/locale/setlocale.c       Sun Apr 14 22:48:22 2013 +0000
+++ b/lib/libc/locale/setlocale.c       Sun Apr 14 23:30:15 2013 +0000
@@ -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 @@
 __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)
diff -r 48ecb965da08 -r 0b81991c631f lib/libc/locale/setlocale_local.h
--- a/lib/libc/locale/setlocale_local.h Sun Apr 14 22:48:22 2013 +0000
+++ b/lib/libc/locale/setlocale_local.h Sun Apr 14 23:30:15 2013 +0000
@@ -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 @@
 #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 @@
 };
 
 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 @@
        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_*/