 @@ -1,14 +1,14 @@
-/* $NetBSD: citrus_lc_ctype.c,v 1.9 2010/06/19 13:26:51 tnozaki Exp $ */
+/* $NetBSD: citrus_lc_ctype.c,v 1.10 2012/03/04 21:14:55 tnozaki Exp $ */
 /*-
  * Copyright (c)2008 Citrus Project,
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -18,27 +18,27 @@
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_lc_ctype.c,v 1.9 2010/06/19 13:26:51 tnozaki Exp $");
+__RCSID("$NetBSD: citrus_lc_ctype.c,v 1.10 2012/03/04 21:14:55 tnozaki Exp $");
 #endif /* LIBC_SCCS and not lint */
 #include "reentrant.h"
 #include <sys/types.h>
 #include <sys/ctype_bits.h>
 #include <sys/queue.h>
 #include <assert.h>
 #include <errno.h>
 #include <langinfo.h>
 #include <limits.h>
 #define __SETLOCALE_SOURCE__
 #include <locale.h>
 #include <stddef.h>
 @@ -120,14 +120,13 @@ _PREFIX(fixup)(_RuneLocale *data)
 	_tolower_tab_ = data->rl_tolower_tab;
 	_toupper_tab_ = data->rl_toupper_tab;
 	_CurrentRuneLocale = data;
+}
 /*
  * macro required by nb_lc_template.h
  */
 #define _CATEGORY_ID		LC_CTYPE
 #define _CATEGORY_NAME		"LC_CTYPE"
 #define _CATEGORY_DEFAULT	_DefaultRuneLocale
 #include "nb_lc_template.h"
 _LOCALE_CATEGORY_ENTRY(_citrus_LC_CTYPE_);

 @@ -1,14 +1,14 @@
-/* $NetBSD: citrus_lc_messages.c,v 1.4 2010/06/13 04:14:57 tnozaki Exp $ */
+/* $NetBSD: citrus_lc_messages.c,v 1.5 2012/03/04 21:14:55 tnozaki Exp $ */
 /*-
  * Copyright (c)2008 Citrus Project,
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -18,27 +18,27 @@
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_lc_messages.c,v 1.4 2010/06/13 04:14:57 tnozaki Exp $");
+__RCSID("$NetBSD: citrus_lc_messages.c,v 1.5 2012/03/04 21:14:55 tnozaki Exp $");
 #endif /* LIBC_SCCS and not lint */
 #include "namespace.h"
 #include "reentrant.h"
 #include <sys/types.h>
 #include <sys/localedef.h>
 #include <sys/queue.h>
 #include <assert.h>
 #include <errno.h>
 #include <langinfo.h>
 #include <limits.h>
 #define __SETLOCALE_SOURCE__
 #include <locale.h>
 @@ -150,14 +150,13 @@ _citrus_LC_MESSAGES_init_fallback(_Messa
 fatal:
 	_citrus_LC_MESSAGES_uninit(data);
 	return EFTYPE;
+}
 /*
  * macro required by citrus_lc_template.h
  */
 #define _CATEGORY_DB		"LC_MESSAGES/SYS_LC_MESSAGES"
 #define _CATEGORY_MAGIC		_CITRUS_LC_MESSAGES_MAGIC_1
 #include "citrus_lc_template.h"
 _LOCALE_CATEGORY_ENTRY(_citrus_LC_MESSAGES_);

 @@ -1,14 +1,14 @@
-/* $NetBSD: citrus_lc_monetary.c,v 1.4 2010/06/13 04:14:57 tnozaki Exp $ */
+/* $NetBSD: citrus_lc_monetary.c,v 1.5 2012/03/04 21:14:55 tnozaki Exp $ */
 /*-
  * Copyright (c)2008 Citrus Project,
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -18,27 +18,27 @@
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_lc_monetary.c,v 1.4 2010/06/13 04:14:57 tnozaki Exp $");
+__RCSID("$NetBSD: citrus_lc_monetary.c,v 1.5 2012/03/04 21:14:55 tnozaki Exp $");
 #endif /* LIBC_SCCS and not lint */
 #include "namespace.h"
 #include "reentrant.h"
 #include <sys/types.h>
 #include <sys/localedef.h>
 #include <sys/queue.h>
 #include <assert.h>
 #include <errno.h>
 #include <langinfo.h>
 #include <limits.h>
 #define __SETLOCALE_SOURCE__
 #include <locale.h>
 @@ -207,14 +207,13 @@ _citrus_LC_MONETARY_init_fallback(_Monet
 fatal:
 	_citrus_LC_MONETARY_uninit(data);
 	return EFTYPE;
+}
 /*
  * macro required by citrus_lc_template.h
  */
 #define _CATEGORY_DB		"LC_MONETARY"
 #define _CATEGORY_MAGIC		_CITRUS_LC_MONETARY_MAGIC_1
 #include "citrus_lc_template.h"
 _LOCALE_CATEGORY_ENTRY(_citrus_LC_MONETARY_);

 @@ -1,14 +1,14 @@
-/* $NetBSD: citrus_lc_numeric.c,v 1.4 2010/06/13 04:14:57 tnozaki Exp $ */
+/* $NetBSD: citrus_lc_numeric.c,v 1.5 2012/03/04 21:14:55 tnozaki Exp $ */
 /*-
  * Copyright (c)2008 Citrus Project,
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -18,27 +18,27 @@
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_lc_numeric.c,v 1.4 2010/06/13 04:14:57 tnozaki Exp $");
+__RCSID("$NetBSD: citrus_lc_numeric.c,v 1.5 2012/03/04 21:14:55 tnozaki Exp $");
 #endif /* LIBC_SCCS and not lint */
 #include "namespace.h"
 #include "reentrant.h"
 #include <sys/types.h>
 #include <sys/localedef.h>
 #include <sys/queue.h>
 #include <assert.h>
 #include <errno.h>
 #include <langinfo.h>
 #include <limits.h>
 #define __SETLOCALE_SOURCE__
 #include <locale.h>
 @@ -156,14 +156,13 @@ _citrus_LC_NUMERIC_init_fallback(_Numeri
 fatal:
 	_citrus_LC_NUMERIC_uninit(data);
 	return EFTYPE;
+}
 /*
  * macro required by citrus_lc_template.h
  */
 #define _CATEGORY_DB		"LC_NUMERIC"
 #define _CATEGORY_MAGIC		_CITRUS_LC_NUMERIC_MAGIC_1
 #include "citrus_lc_template.h"
 _LOCALE_CATEGORY_ENTRY(_citrus_LC_NUMERIC_);

 @@ -1,14 +1,14 @@
-/* $NetBSD: citrus_lc_time.c,v 1.5 2010/06/13 04:14:57 tnozaki Exp $ */
+/* $NetBSD: citrus_lc_time.c,v 1.6 2012/03/04 21:14:55 tnozaki Exp $ */
 /*-
  * Copyright (c)2008 Citrus Project,
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -18,27 +18,27 @@
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_lc_time.c,v 1.5 2010/06/13 04:14:57 tnozaki Exp $");
+__RCSID("$NetBSD: citrus_lc_time.c,v 1.6 2012/03/04 21:14:55 tnozaki Exp $");
 #endif /* LIBC_SCCS and not lint */
 #include "namespace.h"
 #include "reentrant.h"
 #include <sys/types.h>
 #include <sys/localedef.h>
 #include <sys/queue.h>
 #include <assert.h>
 #include <errno.h>
 #include <langinfo.h>
 #include <limits.h>
 #define __SETLOCALE_SOURCE__
 #include <locale.h>
 @@ -201,14 +201,13 @@ _citrus_LC_TIME_init_fallback(_TimeLocal
 fatal:
 	_citrus_LC_TIME_uninit(data);
 	return EFTYPE;
+}
 /*
  * macro required by citrus_lc_template.h
  */
 #define _CATEGORY_DB		"LC_TIME"
 #define _CATEGORY_MAGIC		_CITRUS_LC_TIME_MAGIC_1
 #include "citrus_lc_template.h"
 _LOCALE_CATEGORY_ENTRY(_citrus_LC_TIME_);

 @@ -1,14 +1,14 @@
-/* $NetBSD: dummy_lc_collate.c,v 1.2 2009/01/11 02:46:28 christos Exp $ */
+/* $NetBSD: dummy_lc_collate.c,v 1.3 2012/03/04 21:14:56 tnozaki Exp $ */
 /*-
  * Copyright (c)2008 Citrus Project,
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -18,37 +18,36 @@
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: dummy_lc_collate.c,v 1.2 2009/01/11 02:46:28 christos Exp $");
+__RCSID("$NetBSD: dummy_lc_collate.c,v 1.3 2012/03/04 21:14:56 tnozaki Exp $");
 #endif /* LIBC_SCCS and not lint */
 #include <sys/types.h>
 #include <assert.h>
 #include <langinfo.h>
 #define __SETLOCALE_SOURCE__
 #include <locale.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include "setlocale_local.h"
 /*
  * macro required by dummy_lc_template.h
  */
 #define _PREFIX(name)		__CONCAT(_dummy_LC_COLLATE_,name)
 #define _CATEGORY_ID		LC_COLLATE
 #define _CATEGORY_NAME		"LC_COLLATE"
 #include "dummy_lc_template.h"
 _LOCALE_CATEGORY_ENTRY(_dummy_LC_COLLATE_);

 @@ -1,14 +1,14 @@
-/* $NetBSD: dummy_lc_template.h,v 1.2 2009/01/11 02:46:28 christos Exp $ */
+/* $NetBSD: dummy_lc_template.h,v 1.3 2012/03/04 21:14:56 tnozaki Exp $ */
 /*-
  * Copyright (c)2008 Citrus Project,
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -21,36 +21,34 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #ifndef _DUMMY_LC_TEMPLATE_H_
 #define _DUMMY_LC_TEMPLATE_H_
 #include "generic_lc_template_decl.h"
-static const char *
+const char *
 _PREFIX(setlocale)(const char * __restrict name,
     struct _locale_impl_t * __restrict locale)
+{
 	if (name != NULL) {
 		if (*name == '\0')
 			name = _get_locale_env(_CATEGORY_NAME);
 		if (strcmp(name, locale->part_name[(size_t)_CATEGORY_ID])) {
 			if (!strcmp(_C_LOCALE, name))
 				name = _C_LOCALE;
 			else if (!strcmp(_POSIX_LOCALE, name))
 				name = _POSIX_LOCALE;
 			else
 				return NULL;
 			locale->part_name[(size_t)_CATEGORY_ID] = name;
+		}
+	}
 	return locale->part_name[(size_t)_CATEGORY_ID];
+}
 #include "generic_lc_template.h"
 #endif /*_DUMMY_LC_TEMPLATE_H_*/

 @@ -1,14 +1,14 @@
-/* $NetBSD: generic_lc_template_decl.h,v 1.2 2009/01/11 02:46:28 christos Exp $ */
+/* $NetBSD: generic_lc_template_decl.h,v 1.3 2012/03/04 21:14:56 tnozaki Exp $ */
 /*-
  * Copyright (c)2008 Citrus Project,
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -19,17 +19,17 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #ifndef _GENERIC_LC_TEMPLATE_DECL_H_
 #define _GENERIC_LC_TEMPLATE_DECL_H_
-static const char * _PREFIX(setlocale)(const char * __restrict,
+const char * _PREFIX(setlocale)(const char * __restrict,
     struct _locale_impl_t * __restrict);
 #endif /*_GENERIC_LC_TEMPLATE_DECL_H_*/

 @@ -1,14 +1,14 @@
-/* $NetBSD: generic_lc_all.c,v 1.3 2009/10/04 21:05:18 tnozaki Exp $ */
+/* $NetBSD: generic_lc_all.c,v 1.4 2012/03/04 21:14:56 tnozaki Exp $ */
 /*-
  * Copyright (c)2008 Citrus Project,
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -18,107 +18,100 @@
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: generic_lc_all.c,v 1.3 2009/10/04 21:05:18 tnozaki Exp $");
+__RCSID("$NetBSD: generic_lc_all.c,v 1.4 2012/03/04 21:14:56 tnozaki Exp $");
 #endif /* LIBC_SCCS and not lint */
 #include <sys/types.h>
 #include <assert.h>
 #include <langinfo.h>
 #define __SETLOCALE_SOURCE__
 #include <locale.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include "setlocale_local.h"
 /*
  * macro required by all template headers
  */
 #define _PREFIX(name)	__CONCAT(_generic_LC_ALL_, name)
 #include "generic_lc_template_decl.h"
 const char *
 _generic_LC_ALL_setlocale(const char * __restrict name,
     struct _locale_impl_t * __restrict locale)
+{
-	_locale_category_t *l;
+	_locale_set_t sl;
 	char head[_LOCALENAME_LEN_MAX * (_LC_LAST - 1)], *tail;
 	const char *tokens[_LC_LAST], *s, *t;
 	int load_locale_success, i, j;
-	l = _find_category(1);
+	sl = _find_category(1);
-	_DIAGASSERT(l != NULL);
+	_DIAGASSERT(sl != NULL);
 	load_locale_success = 0;
 	if (name != NULL) {
 		strlcpy(&head[0], name, sizeof(head));
 		tokens[1] = &head[0];
 		tail = strchr(tokens[1], '/');
 		if (tail == NULL) {
 			for (i = 2; i < _LC_LAST; ++i)
 				tokens[i] = tokens[1];
 		} else {
 			*tail++ = '\0';
 			for (i = 2; i < _LC_LAST - 1; ++i) {
 				tokens[i] = (const char *)tail;
 				tail = strchr(tokens[i], '/');
 				if (tail == NULL)
 					return NULL;
 				*tail++ = '\0';
+			}
 			tokens[_LC_LAST - 1] = (const char *)tail;
 			tail = strchr(tokens[i], '/');
 			if (tail != NULL)
 				return NULL;
+		}
-		if ((*l->setlocale)(tokens[1], locale) != NULL)
+		if ((*sl)(tokens[1], locale) != NULL)
 			load_locale_success = 1;
+	}
-	s = (*l->setlocale)(NULL, locale);
+	s = (*sl)(NULL, locale);
 	_DIAGASSERT(s != NULL);
 	strlcpy(&locale->query[0], s, sizeof(locale->query));
 	for (i = 2, j = 0; i < _LC_LAST; ++i) {
-		l = _find_category(i);
+		sl = _find_category(i);
-		_DIAGASSERT(l != NULL);
+		_DIAGASSERT(sl != NULL);
 		if (name != NULL) {
-			if ((*l->setlocale)(tokens[i], locale) != NULL)
+			if ((*sl)(tokens[i], locale) != NULL)
 				load_locale_success = 1;
+		}
-		t = (*l->setlocale)(NULL, locale);
+		t = (*sl)(NULL, locale);
 		_DIAGASSERT(t != NULL);
 		if (j == 0) {
 			if (!strcmp(s, t))
 				continue;
 			for (j = 2; j < i; ++j) {
 				strlcat(&locale->query[0], "/",
 				    sizeof(locale->query));
 				strlcat(&locale->query[0], s,
 				    sizeof(locale->query));
+			}
+		}
 		strlcat(&locale->query[0], "/", sizeof(locale->query));
 		strlcat(&locale->query[0], t, sizeof(locale->query));
+	}
 	if (name != NULL && !load_locale_success)
 		return NULL;
 	return (const char *)&locale->query[0];
+}
 /*
  * macro requrired by generic_lc_template.h
  */
 #define _CATEGORY_ID	LC_ALL
 #include "generic_lc_template.h"
 _LOCALE_CATEGORY_ENTRY(_generic_LC_ALL_);

 @@ -1,14 +1,14 @@
-/* $NetBSD: nb_lc_template.h,v 1.3 2010/05/22 13:15:59 tnozaki Exp $ */
+/* $NetBSD: nb_lc_template.h,v 1.4 2012/03/04 21:14:56 tnozaki Exp $ */
 /*-
  * Copyright (c)1999, 2008 Citrus Project,
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -204,27 +204,27 @@ do {									\
 	aliaspath = (const char *)&path[0];
 	snprintf(&loccat[0], sizeof(loccat),
 	    "%s/" _CATEGORY_NAME, name);
 	_LOAD_SUB_ALIAS((const char *)&loccat[0]);
 	/* (3) lookup locname type alias */
 	_LOAD_SUB_ALIAS(name);
 done:
 	mutex_unlock(&_nb_mutex);
 	return ret;
+}
-static const char *
+const char *
 _PREFIX(setlocale)(const char * __restrict name,
     struct _locale_impl_t * __restrict locale)
+{
 	_nb_part_t *part;
 	/* name may be NULL */
 	_DIAGASSERT(locale != NULL);
 	if (name != NULL) {
 		if (*name == '\0')
 			name = _get_locale_env(_CATEGORY_NAME);
 		_DIAGASSERT(name != NULL);
 		_DIAGASSERT(locale->part_name[(size_t)_CATEGORY_ID] != NULL);
 @@ -233,16 +233,14 @@ _PREFIX(setlocale)(const char * __restri
 				return NULL;
 			locale->part_name[(size_t)_CATEGORY_ID]
 			    = &part->name[0];
 			locale->part_impl[(size_t)_CATEGORY_ID]
 			    = part->impl;
 			_PREFIX(build_cache)(locale->cache, part->impl);
 			if (locale == &_global_locale)
 				_PREFIX(fixup)(part->impl);
+		}
+	}
 	return locale->part_name[(size_t)_CATEGORY_ID];
+}
 #include "generic_lc_template.h"
 #endif /*_NB_LC_TEMPLATE_H_*/

 @@ -1,14 +1,14 @@
-/* $NetBSD: setlocale.c,v 1.59 2012/01/20 16:31:30 joerg Exp $ */
+/* $NetBSD: setlocale.c,v 1.60 2012/03/04 21:14:56 tnozaki Exp $ */
 /*-
  * Copyright (c)2008 Citrus Project,
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -18,68 +18,56 @@
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: setlocale.c,v 1.59 2012/01/20 16:31:30 joerg Exp $");
+__RCSID("$NetBSD: setlocale.c,v 1.60 2012/03/04 21:14:56 tnozaki Exp $");
 #endif /* LIBC_SCCS and not lint */
 #include <sys/types.h>
 #include <locale.h>
 #include <limits.h>
 #include <paths.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include "setlocale_local.h"
 const char *_PathLocale = NULL;
-__link_set_decl(all_categories, _locale_category_t);
+static _locale_set_t all_categories[_LC_LAST] = {
 	[LC_ALL     ] = &_generic_LC_ALL_setlocale,
 	[LC_COLLATE ] = &_dummy_LC_COLLATE_setlocale,
 	[LC_CTYPE   ] = &_citrus_LC_CTYPE_setlocale,
 	[LC_MONETARY] = &_citrus_LC_MONETARY_setlocale,
 	[LC_NUMERIC ] = &_citrus_LC_NUMERIC_setlocale,
 	[LC_TIME    ] = &_citrus_LC_TIME_setlocale,
 	[LC_MESSAGES] = &_citrus_LC_MESSAGES_setlocale,
 };
-extern const _locale_category_t _generic_LC_ALL_desc;
+_locale_set_t
 extern const _locale_category_t _dummy_LC_COLLATE_desc;
 extern const _locale_category_t _citrus_LC_CTYPE_desc;
 extern const _locale_category_t _citrus_LC_MONETARY_desc;
 extern const _locale_category_t _citrus_LC_NUMERIC_desc;
 extern const _locale_category_t _citrus_LC_TIME_desc;
 extern const _locale_category_t _citrus_LC_MESSAGES_desc;
 __link_set_add_data(all_categories, _generic_LC_ALL_desc);
 __link_set_add_data(all_categories, _dummy_LC_COLLATE_desc);
 __link_set_add_data(all_categories, _citrus_LC_CTYPE_desc);
 __link_set_add_data(all_categories, _citrus_LC_MONETARY_desc);
 __link_set_add_data(all_categories, _citrus_LC_NUMERIC_desc);
 __link_set_add_data(all_categories, _citrus_LC_TIME_desc);
 __link_set_add_data(all_categories, _citrus_LC_MESSAGES_desc);
 _locale_category_t *
 _find_category(int category)
+{
-	_locale_category_t * const *p;
+	if (category >= LC_ALL && category < _LC_LAST)
 		return all_categories[category];
 	__link_set_foreach(p, all_categories) {
 		if ((*p)->category == category)
 			return *p;
 	return NULL;
+}
 const char *
 _get_locale_env(const char *category)
+{
 	const char *name;
 	/* 1. check LC_ALL */
 	name = (const char *)getenv("LC_ALL");
 	if (name == NULL || *name == '\0') {
 		/* 2. check LC_* */
 		name = (const char *)getenv(category);
 @@ -87,39 +75,36 @@ _get_locale_env(const char *category)
 			/* 3. check LANG */
 			name = getenv("LANG");
+		}
+	}
 	if (name == NULL || *name == '\0' || strchr(name, '/'))
 		/* 4. if none is set, fall to "C" */
 		name = _C_LOCALE;
 	return name;
+}
 char *
 __setlocale(int category, const char *name)
+{
-	_locale_category_t *l;
+	_locale_set_t sl;
 	struct _locale_impl_t *impl;
-	if (category >= LC_ALL && category < _LC_LAST) {
+	sl = _find_category(category);
-		l = _find_category(category);
+	if (sl == NULL)
-		if (l != NULL) {
+		return NULL;
-			if (issetugid() || ((_PathLocale == NULL &&
+	if (issetugid() || ((_PathLocale == NULL &&
-			    (_PathLocale = getenv("PATH_LOCALE")) == NULL) ||
+	    (_PathLocale = getenv("PATH_LOCALE")) == NULL) ||
-			    *_PathLocale == '\0'))
+	    *_PathLocale == '\0'))
-				_PathLocale = _PATH_LOCALE;
+		_PathLocale = _PATH_LOCALE;
-			impl = *_current_locale();
+	impl = *_current_locale();
-			return __UNCONST((*l->setlocale)(name, impl));
+	return __UNCONST((*sl)(name, impl));
 	return NULL;
+}
 char *
 setlocale(int category, const char *locale)
+{
 	/* locale may be NULL */
 	__mb_len_max_runtime = MB_LEN_MAX;
 	return __setlocale(category, locale);
+}

 @@ -1,14 +1,14 @@
-/* $NetBSD: setlocale_local.h,v 1.7 2010/06/07 13:52:30 tnozaki Exp $ */
+/* $NetBSD: setlocale_local.h,v 1.8 2012/03/04 21:14:57 tnozaki Exp $ */
 /*-
  * Copyright (c)2008 Citrus Project,
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -48,36 +48,45 @@ struct _locale_cache_t {
 	const char **items;
 };
 struct _locale_impl_t {
 	struct _locale_cache_t *cache;
 	char query[_LOCALENAME_LEN_MAX * (_LC_LAST - 1)];
 	const char *part_name[_LC_LAST];
 	_locale_part_t part_impl[_LC_LAST];
 };
 typedef const char *(*_locale_set_t)(const char * __restrict,
     struct _locale_impl_t * __restrict);
 typedef struct {
 	const char* name;
 	int category;
 	_locale_set_t setlocale;
 } _locale_category_t;
 __BEGIN_DECLS
-_locale_category_t	*_find_category(int);
+_locale_set_t		_find_category(int);
 const char		*_get_locale_env(const char *);
 struct _locale_impl_t	**_current_locale(void);
 char			*__setlocale(int, const char *);
 const char *_generic_LC_ALL_setlocale(
     const char * __restrict, struct _locale_impl_t * __restrict);
 const char *_dummy_LC_COLLATE_setlocale(
     const char * __restrict, struct _locale_impl_t * __restrict);
 const char *_citrus_LC_CTYPE_setlocale(
     const char * __restrict, struct _locale_impl_t * __restrict);
 const char *_citrus_LC_MONETARY_setlocale(
     const char * __restrict, struct _locale_impl_t * __restrict);
 const char *_citrus_LC_NUMERIC_setlocale(
     const char * __restrict, struct _locale_impl_t * __restrict);
 const char *_citrus_LC_TIME_setlocale(
     const char * __restrict, struct _locale_impl_t * __restrict);
 const char *_citrus_LC_MESSAGES_setlocale(
     const char * __restrict, struct _locale_impl_t * __restrict);
 __END_DECLS
 static __inline struct _locale_cache_t *
 _current_cache(void)
+{
 	return (*_current_locale())->cache;
+}
 extern struct _locale_impl_t	_global_locale;
 extern size_t __mb_len_max_runtime;
 #endif /*_SETLOCALE_LOCAL_H_*/