 @@ -1,133 +1,132 @@
-/* $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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * 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>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
 #include "setlocale_local.h"
 #include "citrus_namespace.h"
 #include "citrus_bcs.h"
 #include "citrus_region.h"
 #include "citrus_lookup.h"
 #include "citrus_aliasname_local.h"
 #include "citrus_module.h"
 #include "citrus_ctype.h"
 #include "citrus_mmap.h"
 #include "runetype_local.h"
 #include "multibyte.h"
 /*
  * macro required by all template headers
  */
 #define _PREFIX(name)		__CONCAT(_citrus_LC_CTYPE_, name)
 /*
  * macro required by nb_lc_template(_decl).h
  */
 #define _CATEGORY_TYPE          _RuneLocale
 #include "nb_lc_template_decl.h"
 static int
 _citrus_LC_CTYPE_create_impl(const char * __restrict root,
     const char * __restrict name, _RuneLocale ** __restrict pdata)
+{
 	char path[PATH_MAX + 1];
 	int ret;
 	struct _region r;
 	_DIAGASSERT(root != NULL);
 	_DIAGASSERT(name != NULL);
 	_DIAGASSERT(pdata != NULL);
 	snprintf(path, sizeof(path),
 	    "%s/%s/LC_CTYPE", root, name);
 	ret = _citrus_map_file(&r, path);
 	if (!ret) {
 		ret = _rune_load((const char *)r.r_head, r.r_size, pdata);
 		_citrus_unmap_file(&r);
+	}
 	return ret;
+}
 static __inline void
 _PREFIX(build_cache)(struct _locale_cache_t * __restrict cache,
     _RuneLocale * __restrict data)
+{
 	_DIAGASSERT(cache != NULL);
 	_DIAGASSERT(cache->items != NULL);
 	_DIAGASSERT(data != NULL);
 	cache->ctype_tab = data->rl_ctype_tab;
 	cache->tolower_tab = data->rl_tolower_tab;
 	cache->toupper_tab = data->rl_toupper_tab;
 	cache->mb_cur_max = _citrus_ctype_get_mb_cur_max(data->rl_citrus_ctype);
 	cache->items[(size_t)CODESET] = data->rl_codeset;
+}
 static __inline void
 _PREFIX(fixup)(_RuneLocale *data)
+{
 	_DIAGASSERT(data != NULL);
 	__mb_cur_max = _citrus_ctype_get_mb_cur_max(data->rl_citrus_ctype);
 	_ctype_ = data->rl_ctype_tab;
 	_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,163 +1,162 @@
-/* $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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * 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>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include "setlocale_local.h"
 #include "citrus_namespace.h"
 #include "citrus_types.h"
 #include "citrus_bcs.h"
 #include "citrus_region.h"
 #include "citrus_lookup.h"
 #include "citrus_aliasname_local.h"
 #include "citrus_module.h"
 #include "citrus_mmap.h"
 #include "citrus_hash.h"
 #include "citrus_db.h"
 #include "citrus_db_hash.h"
 #include "citrus_memstream.h"
 #include "runetype_local.h"
 /*
  * macro required by all template headers
  */
 #define _PREFIX(name)		__CONCAT(_citrus_LC_MESSAGES_, name)
 #include "nb_lc_messages_misc.h"
 #include "citrus_lc_template_decl.h"
 static __inline void
 _citrus_LC_MESSAGES_uninit(_MessagesLocale *data)
+{
 	free(__UNCONST(data->yesexpr));
 	free(__UNCONST(data->noexpr));
 	free(__UNCONST(data->yesstr));
 	free(__UNCONST(data->nostr));
+}
 #include "citrus_lc_messages.h"
 struct _citrus_LC_MESSAGES_key {
 	const char *name;
 	size_t offset;
 };
 #define OFFSET(field) (offsetof(_MessagesLocale, field))
 static const struct _citrus_LC_MESSAGES_key keys[] = {
   { _CITRUS_LC_MESSAGES_SYM_YESEXPR, OFFSET(yesexpr) },
   { _CITRUS_LC_MESSAGES_SYM_NOEXPR,  OFFSET(noexpr ) },
   { _CITRUS_LC_MESSAGES_SYM_YESSTR,  OFFSET(yesstr ) },
   { _CITRUS_LC_MESSAGES_SYM_NOSTR,   OFFSET(nostr  ) },
   { NULL, 0 }
 };
 static __inline int
 _citrus_LC_MESSAGES_init_normal(_MessagesLocale * __restrict data,
     struct _citrus_db * __restrict db)
+{
 	const struct _citrus_LC_MESSAGES_key *key;
 	char **p;
 	const char *s;
 	_DIAGASSERT(data != NULL);
 	_DIAGASSERT(db != NULL);
 	memset(data, 0, sizeof(*data));
 	for (key = &keys[0]; key->name != NULL; ++key) {
 		if (_db_lookupstr_by_s(db, key->name, &s, NULL))
 			goto fatal;
 		p = (char **)(void *)
 		    (((char *)(void *)data) + key->offset);
 		*p = strdup(s);
 		if (*p == NULL)
 			goto fatal;
+	}
 	return 0;
 fatal:
 	_citrus_LC_MESSAGES_uninit(data);
 	return EFTYPE;
+}
 static __inline int
 _citrus_LC_MESSAGES_init_fallback(_MessagesLocale * __restrict data,
     struct _memstream * __restrict ms)
+{
 	const struct _citrus_LC_MESSAGES_key *key;
 	char **p;
 	const char *s;
 	size_t n;
 	_DIAGASSERT(data != NULL);
 	_DIAGASSERT(ms != NULL);
 	memset(data, 0, sizeof(*data));
 	for (key = &keys[0]; key->name != NULL; ++key) {
 		if ((s = _memstream_getln(ms, &n)) == NULL)
 			goto fatal;
 		p = (char **)(void *)
 		    (((char *)(void *)data) + key->offset);
 		*p = strndup(s, n - 1);
 		if (*p == NULL)
 			goto fatal;
+	}
 	return 0;
 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,220 +1,219 @@
-/* $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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * 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>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include "setlocale_local.h"
 #include "citrus_namespace.h"
 #include "citrus_types.h"
 #include "citrus_bcs.h"
 #include "citrus_region.h"
 #include "citrus_lookup.h"
 #include "citrus_aliasname_local.h"
 #include "citrus_module.h"
 #include "citrus_mmap.h"
 #include "citrus_hash.h"
 #include "citrus_db.h"
 #include "citrus_db_hash.h"
 #include "citrus_memstream.h"
 #include "runetype_local.h"
 #include "fix_grouping.h"
 #include "citrus_fix_grouping.h"
 /*
  * macro required by all template headers
  */
 #define _PREFIX(name)		__CONCAT(_citrus_LC_MONETARY_, name)
 #include "nb_lc_monetary_misc.h"
 #include "citrus_lc_template_decl.h"
 static __inline void
 _citrus_LC_MONETARY_uninit(_MonetaryLocale *data)
+{
 	_DIAGASSERT(data != NULL);
 	free(__UNCONST(data->int_curr_symbol));
 	free(__UNCONST(data->currency_symbol));
 	free(__UNCONST(data->mon_decimal_point));
 	free(__UNCONST(data->mon_thousands_sep));
 	free(__UNCONST(data->mon_grouping));
 	free(__UNCONST(data->positive_sign));
 	free(__UNCONST(data->negative_sign));
+}
 #include "citrus_lc_monetary.h"
 struct _citrus_LC_MONETARY_key {
 	const char *name;
 	size_t offset;
 };
 #define OFFSET(field) (offsetof(_MonetaryLocale, field))
 static const struct _citrus_LC_MONETARY_key keys_string[] = {
   { _CITRUS_LC_MONETARY_SYM_INT_CURR_SYMBOL,    OFFSET(int_curr_symbol   ) },
   { _CITRUS_LC_MONETARY_SYM_CURRENCY_SYMBOL,    OFFSET(currency_symbol   ) },
   { _CITRUS_LC_MONETARY_SYM_MON_DECIMAL_POINT,  OFFSET(mon_decimal_point ) },
   { _CITRUS_LC_MONETARY_SYM_MON_THOUSANDS_SEP,  OFFSET(mon_thousands_sep ) },
   { _CITRUS_LC_MONETARY_SYM_MON_GROUPING,       OFFSET(mon_grouping      ) },
   { _CITRUS_LC_MONETARY_SYM_POSITIVE_SIGN,      OFFSET(positive_sign     ) },
   { _CITRUS_LC_MONETARY_SYM_NEGATIVE_SIGN,      OFFSET(negative_sign     ) },
   { NULL, (size_t)0 }
 };
 static const struct _citrus_LC_MONETARY_key keys_char[] = {
   { _CITRUS_LC_MONETARY_SYM_INT_FRAC_DIGITS,    OFFSET(int_frac_digits   ) },
   { _CITRUS_LC_MONETARY_SYM_FRAC_DIGITS,        OFFSET(frac_digits       ) },
   { _CITRUS_LC_MONETARY_SYM_P_CS_PRECEDES,      OFFSET(p_cs_precedes     ) },
   { _CITRUS_LC_MONETARY_SYM_P_SEP_BY_SPACE,     OFFSET(p_sep_by_space    ) },
   { _CITRUS_LC_MONETARY_SYM_N_CS_PRECEDES,      OFFSET(n_cs_precedes     ) },
   { _CITRUS_LC_MONETARY_SYM_N_SEP_BY_SPACE,     OFFSET(n_sep_by_space    ) },
   { _CITRUS_LC_MONETARY_SYM_P_SIGN_POSN,        OFFSET(p_sign_posn       ) },
   { _CITRUS_LC_MONETARY_SYM_N_SIGN_POSN,        OFFSET(n_sign_posn       ) },
   { _CITRUS_LC_MONETARY_SYM_INT_P_CS_PRECEDES,  OFFSET(int_p_cs_precedes ) },
   { _CITRUS_LC_MONETARY_SYM_INT_N_CS_PRECEDES,  OFFSET(int_n_cs_precedes ) },
   { _CITRUS_LC_MONETARY_SYM_INT_P_SEP_BY_SPACE, OFFSET(int_p_sep_by_space) },
   { _CITRUS_LC_MONETARY_SYM_INT_N_SEP_BY_SPACE, OFFSET(int_n_sep_by_space) },
   { _CITRUS_LC_MONETARY_SYM_INT_P_SIGN_POSN,    OFFSET(int_p_sign_posn   ) },
   { _CITRUS_LC_MONETARY_SYM_INT_N_SIGN_POSN,    OFFSET(int_n_sign_posn   ) },
   { NULL, (size_t)0 }
 };
 static __inline int
 _citrus_LC_MONETARY_init_normal(_MonetaryLocale * __restrict data,
     struct _citrus_db * __restrict db)
+{
 	const struct _citrus_LC_MONETARY_key *key;
 	char **p_string, *p_char;
 	const char *s;
 	uint8_t u8;
 	_DIAGASSERT(data != NULL);
 	_DIAGASSERT(db != NULL);
 	memset(data, 0, sizeof(*data));
 	for (key = &keys_string[0]; key->name != NULL; ++key) {
 		if (_db_lookupstr_by_s(db, key->name, &s, NULL))
 			goto fatal;
 		p_string = (char **)(void *)
 		    (((char *)(void *)data) + key->offset);
 		*p_string = strdup(s);
 		if (*p_string == NULL)
 			goto fatal;
+	}
 	for (key = &keys_char[0]; key->name != NULL; ++key) {
 		if (_db_lookup8_by_s(db, key->name, &u8, NULL))
 			goto fatal;
 		p_char = ((char *)(void *)data) + key->offset;
 		*p_char = (char)(unsigned char)u8;
+	}
 	_CITRUS_FIXUP_CHAR_MAX_MD(data->mon_grouping);
 	return 0;
 fatal:
 	_citrus_LC_MONETARY_uninit(data);
 	return EFTYPE;
+}
 static __inline int
 _citrus_LC_MONETARY_init_fallback(_MonetaryLocale * __restrict data,
     struct _memstream * __restrict ms)
+{
 	const struct _citrus_LC_MONETARY_key *key;
 	char **p_string, *p_char;
 	const char *s;
 	size_t n;
 	char *t;
 	long int l;
 	_DIAGASSERT(data != NULL);
 	_DIAGASSERT(ms != NULL);
 	memset(data, 0, sizeof(*data));
 	for (key = &keys_string[0]; key->name != NULL; ++key) {
 		if ((s = _memstream_getln(ms, &n)) == NULL)
 			goto fatal;
 		p_string = (char **)(void *)
 		    (((char *)(void *)data) + key->offset);
 		*p_string = strndup(s, n - 1);
 		if (*p_string == NULL)
 			goto fatal;
+	}
 	for (key = &keys_char[0]; key->name != NULL; ++key) {
 		if ((s = _memstream_getln(ms, &n)) == NULL)
 			goto fatal;
 		t = strndup(s, n - 1);
 		if (t == NULL)
 			goto fatal;
 		s = (const char *)t;
 		l = _bcs_strtol(s, &t, 0);
 		if (s == t || l < 0 || l > 0x7fL) {
 			free(t);
 			goto fatal;
+		}
 		free(t);
 		p_char = ((char *)(void *)data) + key->offset;
 		*p_char = (char)(l & 0x7fL);
+	}
         data->mon_grouping =
 	    __fix_locale_grouping_str(data->mon_grouping);
 	return 0;
 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,169 +1,168 @@
-/* $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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * 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>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include "setlocale_local.h"
 #include "citrus_namespace.h"
 #include "citrus_types.h"
 #include "citrus_bcs.h"
 #include "citrus_region.h"
 #include "citrus_lookup.h"
 #include "citrus_aliasname_local.h"
 #include "citrus_module.h"
 #include "citrus_mmap.h"
 #include "citrus_hash.h"
 #include "citrus_db.h"
 #include "citrus_db_hash.h"
 #include "citrus_memstream.h"
 #include "runetype_local.h"
 #include "fix_grouping.h"
 #include "citrus_fix_grouping.h"
 /*
  * macro required by all template headers
  */
 #define _PREFIX(name)		__CONCAT(_citrus_LC_NUMERIC_, name)
 #include "nb_lc_numeric_misc.h"
 #include "citrus_lc_template_decl.h"
 static __inline void
 _citrus_LC_NUMERIC_uninit(_NumericLocale *data)
+{
 	free(__UNCONST(data->decimal_point));
 	free(__UNCONST(data->thousands_sep));
 	free(__UNCONST(data->grouping));
+}
 #include "citrus_lc_numeric.h"
 struct _citrus_LC_NUMERIC_key {
 	const char *name;
 	size_t offset;
 };
 #define OFFSET(field) (offsetof(_NumericLocale, field))
 static const struct _citrus_LC_NUMERIC_key keys[] = {
   { _CITRUS_LC_NUMERIC_SYM_DECIMAL_POINT, OFFSET(decimal_point) },
   { _CITRUS_LC_NUMERIC_SYM_THOUSANDS_SEP, OFFSET(thousands_sep) },
   { _CITRUS_LC_NUMERIC_SYM_GROUPING,      OFFSET(grouping     ) },
   { NULL, 0 }
 };
 static __inline int
 _citrus_LC_NUMERIC_init_normal(_NumericLocale * __restrict data,
     struct _citrus_db * __restrict db)
+{
 	const struct _citrus_LC_NUMERIC_key *key;
 	char **p;
 	const char *s;
 	_DIAGASSERT(data != NULL);
 	_DIAGASSERT(db != NULL);
 	memset(data, 0, sizeof(*data));
 	for (key = &keys[0]; key->name != NULL; ++key) {
 		if (_db_lookupstr_by_s(db, key->name, &s, NULL))
 			goto fatal;
 		p = (char **)(void *)
 		    (((char *)(void *)data) + key->offset);
 		*p = strdup(s);
 		if (*p == NULL)
 			goto fatal;
+	}
 	_CITRUS_FIXUP_CHAR_MAX_MD(data->grouping);
 	return 0;
 fatal:
 	_citrus_LC_NUMERIC_uninit(data);
 	return EFTYPE;
+}
 static __inline int
 _citrus_LC_NUMERIC_init_fallback(_NumericLocale * __restrict data,
     struct _memstream * __restrict ms)
+{
 	const struct _citrus_LC_NUMERIC_key *key;
 	char **p;
 	const char *s;
 	size_t n;
 	_DIAGASSERT(data != NULL);
 	_DIAGASSERT(ms != NULL);
 	memset(data, 0, sizeof(*data));
 	for (key = &keys[0]; key->name != NULL; ++key) {
 		if ((s = _memstream_getln(ms, &n)) == NULL)
 			goto fatal;
 		p = (char **)(void *)
 		    (((char *)(void *)data) + key->offset);
 		*p = strndup(s, n - 1);
 		if (*p == NULL)
 			goto fatal;
+	}
 	data->grouping =
 	    __fix_locale_grouping_str(data->grouping);
 	return 0;
 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,214 +1,213 @@
-/* $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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * 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>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include "setlocale_local.h"
 #include "citrus_namespace.h"
 #include "citrus_types.h"
 #include "citrus_bcs.h"
 #include "citrus_region.h"
 #include "citrus_lookup.h"
 #include "citrus_aliasname_local.h"
 #include "citrus_module.h"
 #include "citrus_mmap.h"
 #include "citrus_hash.h"
 #include "citrus_db.h"
 #include "citrus_db_hash.h"
 #include "citrus_memstream.h"
 #include "runetype_local.h"
 /*
  * macro required by all template headers
  */
 #define _PREFIX(name)		__CONCAT(_citrus_LC_TIME_, name)
 #include "nb_lc_time_misc.h"
 #include "citrus_lc_template_decl.h"
 static __inline void
 _citrus_LC_TIME_uninit(_TimeLocale *data)
+{
 	size_t i, j;
 	_DIAGASSERT(data != NULL);
 	for (i = ABDAY_IDX(ABDAY_1), j = ABDAY_IDX(ABDAY_7);  i <= j; ++i)
 		free(__UNCONST(data->abday[i]));
 	for (i = DAY_IDX(DAY_1),     j = DAY_IDX(DAY_7);      i <= j; ++i)
 		free(__UNCONST(data->day[i]));
 	for (i = ABMON_IDX(ABMON_1), j = ABMON_IDX(ABMON_12); i <= j; ++i)
 		free(__UNCONST(data->abmon[i]));
 	for (i = MON_IDX(MON_1),     j = MON_IDX(MON_12);     i <= j; ++i)
 		free(__UNCONST(data->mon[i]));
 	for (i = AM_PM_IDX(AM_STR),  j = AM_PM_IDX(PM_STR);   i <= j; ++i)
 		free(__UNCONST(data->am_pm[i]));
 	free(__UNCONST(data->d_t_fmt));
 	free(__UNCONST(data->d_fmt));
 	free(__UNCONST(data->t_fmt));
 	free(__UNCONST(data->t_fmt_ampm));
+}
 #include "citrus_lc_time.h"
 struct _citrus_LC_TIME_key {
 	const char *name;
 	size_t offset;
 };
 #define OFFSET(field) offsetof(_TimeLocale, field)
 static const struct _citrus_LC_TIME_key keys[] = {
   { _CITRUS_LC_TIME_SYM_ABDAY_1,  OFFSET(abday[ABDAY_IDX(ABDAY_1)] ) },
   { _CITRUS_LC_TIME_SYM_ABDAY_2,  OFFSET(abday[ABDAY_IDX(ABDAY_2)] ) },
   { _CITRUS_LC_TIME_SYM_ABDAY_3,  OFFSET(abday[ABDAY_IDX(ABDAY_3)] ) },
   { _CITRUS_LC_TIME_SYM_ABDAY_4,  OFFSET(abday[ABDAY_IDX(ABDAY_4)] ) },
   { _CITRUS_LC_TIME_SYM_ABDAY_5,  OFFSET(abday[ABDAY_IDX(ABDAY_5)] ) },
   { _CITRUS_LC_TIME_SYM_ABDAY_6,  OFFSET(abday[ABDAY_IDX(ABDAY_6)] ) },
   { _CITRUS_LC_TIME_SYM_ABDAY_7,  OFFSET(abday[ABDAY_IDX(ABDAY_7)] ) },
   { _CITRUS_LC_TIME_SYM_DAY_1,    OFFSET(day[DAY_IDX(DAY_1)]       ) },
   { _CITRUS_LC_TIME_SYM_DAY_2,    OFFSET(day[DAY_IDX(DAY_2)]       ) },
   { _CITRUS_LC_TIME_SYM_DAY_3,    OFFSET(day[DAY_IDX(DAY_3)]       ) },
   { _CITRUS_LC_TIME_SYM_DAY_4,    OFFSET(day[DAY_IDX(DAY_4)]       ) },
   { _CITRUS_LC_TIME_SYM_DAY_5,    OFFSET(day[DAY_IDX(DAY_5)]       ) },
   { _CITRUS_LC_TIME_SYM_DAY_6,    OFFSET(day[DAY_IDX(DAY_6)]       ) },
   { _CITRUS_LC_TIME_SYM_DAY_7,    OFFSET(day[DAY_IDX(DAY_7)]       ) },
   { _CITRUS_LC_TIME_SYM_ABMON_1,  OFFSET(abmon[ABMON_IDX(ABMON_1)] ) },
   { _CITRUS_LC_TIME_SYM_ABMON_2,  OFFSET(abmon[ABMON_IDX(ABMON_2)] ) },
   { _CITRUS_LC_TIME_SYM_ABMON_3,  OFFSET(abmon[ABMON_IDX(ABMON_3)] ) },
   { _CITRUS_LC_TIME_SYM_ABMON_4,  OFFSET(abmon[ABMON_IDX(ABMON_4)] ) },
   { _CITRUS_LC_TIME_SYM_ABMON_5,  OFFSET(abmon[ABMON_IDX(ABMON_5)] ) },
   { _CITRUS_LC_TIME_SYM_ABMON_6,  OFFSET(abmon[ABMON_IDX(ABMON_6)] ) },
   { _CITRUS_LC_TIME_SYM_ABMON_7,  OFFSET(abmon[ABMON_IDX(ABMON_7)] ) },
   { _CITRUS_LC_TIME_SYM_ABMON_8,  OFFSET(abmon[ABMON_IDX(ABMON_8)] ) },
   { _CITRUS_LC_TIME_SYM_ABMON_9,  OFFSET(abmon[ABMON_IDX(ABMON_9)] ) },
   { _CITRUS_LC_TIME_SYM_ABMON_10, OFFSET(abmon[ABMON_IDX(ABMON_10)]) },
   { _CITRUS_LC_TIME_SYM_ABMON_11, OFFSET(abmon[ABMON_IDX(ABMON_11)]) },
   { _CITRUS_LC_TIME_SYM_ABMON_12, OFFSET(abmon[ABMON_IDX(ABMON_12)]) },
   { _CITRUS_LC_TIME_SYM_MON_1,    OFFSET(mon[MON_IDX(MON_1)]       ) },
   { _CITRUS_LC_TIME_SYM_MON_2,    OFFSET(mon[MON_IDX(MON_2)]       ) },
   { _CITRUS_LC_TIME_SYM_MON_3,    OFFSET(mon[MON_IDX(MON_3)]       ) },
   { _CITRUS_LC_TIME_SYM_MON_4,    OFFSET(mon[MON_IDX(MON_4)]       ) },
   { _CITRUS_LC_TIME_SYM_MON_5,    OFFSET(mon[MON_IDX(MON_5)]       ) },
   { _CITRUS_LC_TIME_SYM_MON_6,    OFFSET(mon[MON_IDX(MON_6)]       ) },
   { _CITRUS_LC_TIME_SYM_MON_7,    OFFSET(mon[MON_IDX(MON_7)]       ) },
   { _CITRUS_LC_TIME_SYM_MON_8,    OFFSET(mon[MON_IDX(MON_8)]       ) },
   { _CITRUS_LC_TIME_SYM_MON_9,    OFFSET(mon[MON_IDX(MON_9)]       ) },
   { _CITRUS_LC_TIME_SYM_MON_10,   OFFSET(mon[MON_IDX(MON_10)]      ) },
   { _CITRUS_LC_TIME_SYM_MON_11,   OFFSET(mon[MON_IDX(MON_11)]      ) },
   { _CITRUS_LC_TIME_SYM_MON_12,   OFFSET(mon[MON_IDX(MON_12)]      ) },
   { _CITRUS_LC_TIME_SYM_AM_STR,   OFFSET(am_pm[AM_PM_IDX(AM_STR)]  ) },
   { _CITRUS_LC_TIME_SYM_PM_STR,   OFFSET(am_pm[AM_PM_IDX(PM_STR)]  ) },
   { _CITRUS_LC_TIME_SYM_D_T_FMT,  OFFSET(d_t_fmt                   ) },
   { _CITRUS_LC_TIME_SYM_D_FMT,    OFFSET(d_fmt                     ) },
   { _CITRUS_LC_TIME_SYM_T_FMT,    OFFSET(t_fmt                     ) },
   { _CITRUS_LC_TIME_SYM_T_FMT_AMPM, OFFSET(t_fmt_ampm                ) },
   { NULL, 0 }
 };
 static __inline int
 _citrus_LC_TIME_init_normal(_TimeLocale * __restrict data,
     struct _citrus_db * __restrict db)
+{
         const struct _citrus_LC_TIME_key *key;
 	char **p;
 	const char *s;
 	_DIAGASSERT(data != NULL);
 	_DIAGASSERT(db != NULL);
 	memset(data, 0, sizeof(*data));
 	for (key = &keys[0]; key->name != NULL; ++key) {
 		if (_db_lookupstr_by_s(db, key->name, &s, NULL))
 			goto fatal;
 		p = (char **)(void *)
 		    (((char *)(void *)data) + key->offset);
 		*p = strdup(s);
 		if (*p == NULL)
 			goto fatal;
+	}
 	return 0;
 fatal:
 	_citrus_LC_TIME_uninit(data);
 	return EFTYPE;
+}
 static __inline int
 _citrus_LC_TIME_init_fallback(_TimeLocale * __restrict data,
     struct _memstream * __restrict ms)
+{
         const struct _citrus_LC_TIME_key *key;
 	char **p;
 	const char *s;
 	size_t n;
 	memset(data, 0, sizeof(*data));
 	for (key = &keys[0]; key->name != NULL; ++key) {
 		if ((s = _memstream_getln(ms, &n)) == NULL)
 			goto fatal;
 		p = (char **)(void *)
 		    (((char *)(void *)data) + key->offset);
 		*p = strndup(s, n - 1);
 		if (*p == NULL)
 			goto fatal;
+	}
 	return 0;
 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,54 +1,53 @@
-/* $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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * 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,56 +1,54 @@
-/* $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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * 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.
  */
 #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,124 +1,117 @@
-/* $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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * 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,248 +1,246 @@
-/* $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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * 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.
  */
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Paul Kranenburg.
+ *
  * 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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION 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.
  */
 /*-
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Paul Borman at Krystal Technologies.
+ *
  * 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.
  * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS 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 _NB_LC_TEMPLATE_H_
 #define _NB_LC_TEMPLATE_H_
 #define _nb_part_t		_PREFIX(part_t)
 #define _nb_part_cache		_PREFIX(part_cache)
 #define _nb_default_c		_PREFIX(default_c)
 #define _nb_default_posix	_PREFIX(default_posix)
 #define _nb_mutex		_PREFIX(mutex)
 typedef struct _nb_part_t {
 	char name[_LOCALENAME_LEN_MAX];
 	_CATEGORY_TYPE *impl;
 	SIMPLEQ_ENTRY(_nb_part_t) entry;
 } _nb_part_t;
 static SIMPLEQ_HEAD(, _nb_part_t) _nb_part_cache =
     SIMPLEQ_HEAD_INITIALIZER(_nb_part_cache);
 static const _nb_part_t _nb_default_c = {
     _C_LOCALE,
     __UNCONST(&_CATEGORY_DEFAULT),
     { NULL },
 };
 static const _nb_part_t _nb_default_posix = {
     _POSIX_LOCALE,
     __UNCONST(&_CATEGORY_DEFAULT),
     { NULL },
 };
 #ifdef _REENTRANT
 static mutex_t _nb_mutex = MUTEX_INITIALIZER;
 #endif
 static int
 _PREFIX(load_sub)(const char * __restrict name, const char * __restrict real,
     _nb_part_t ** __restrict part, int force)
+{
 	_nb_part_t *p, *q;
 	int ret;
 	_DIAGASSERT(name != NULL);
 	_DIAGASSERT(part != NULL);
 	if (!strcmp(_C_LOCALE, name)) {
 		p = __UNCONST(&_nb_default_c);
 	} else if (!strcmp(_POSIX_LOCALE, name)) {
 		p = __UNCONST(&_nb_default_posix);
 	} else {
 		SIMPLEQ_FOREACH(p, &_nb_part_cache, entry) {
 			if (!strcmp((const char *)&p->name[0], name))
 				goto found;
+		}
 		p = malloc(sizeof(*p));
 		if (p == NULL)
 			return ENOMEM;
 		if (force) {
 			p->impl = __UNCONST(&_CATEGORY_DEFAULT);
 		} else {
 			_DIAGASSERT(_PathLocale != NULL);
 			ret = _PREFIX(create_impl)((const char *)_PathLocale,
 			    name, &p->impl);
 			if (ret) {
 				free(p);
 				return ret;
+			}
+		}
 		strlcpy(&p->name[0], name, sizeof(p->name));
 		SIMPLEQ_INSERT_TAIL(&_nb_part_cache, p, entry);
+	}
 found:
 	if (real != NULL) {
 		q = malloc(sizeof(*q));
 		if (q == NULL)
 			return ENOMEM;
 		strlcpy(&q->name[0], real, sizeof(p->name));
 		q->impl = p->impl;
 		SIMPLEQ_INSERT_TAIL(&_nb_part_cache, q, entry);
 		p = q;
+	}
 	*part = p;
 	return 0;
+}
 static __inline int
 _PREFIX(load)(const char * __restrict name,
     _nb_part_t ** __restrict part)
+{
 	int ret, force;
 	char path[PATH_MAX + 1], loccat[PATH_MAX + 1], buf[PATH_MAX + 1];
 	const char *aliaspath, *alias;
 #define _LOAD_SUB_ALIAS(key)						\
 do {									\
 	alias = __unaliasname(aliaspath, key, &buf[0], sizeof(buf));	\
 	if (alias != NULL) {						\
 		ret = (force = !__isforcemapping(alias))		\
 		    ? _PREFIX(load_sub)(name, NULL, part, force)	\
 		    : _PREFIX(load_sub)(alias, name, part, force);	\
 		_DIAGASSERT(!ret || !force);				\
 		goto done;						\
 	}								\
 } while (/*CONSTCOND*/0)
 	/* (1) non-aliased file */
 	mutex_lock(&_nb_mutex);
 	ret = _PREFIX(load_sub)(name, NULL, part, 0);
 	if (ret != ENOENT)
 		goto done;
 	/* (2) lookup locname/catname type alias */
 	_DIAGASSERT(_PathLocale != NULL);
 	snprintf(&path[0], sizeof(path),
 	    "%s/" _LOCALE_ALIAS_NAME, _PathLocale);
 	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);
 		if (strcmp(name, locale->part_name[(size_t)_CATEGORY_ID])) {
 			if (_PREFIX(load)(name, &part))
 				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,125 +1,110 @@
-/* $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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * 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);
 		if (name == NULL || *name == '\0') {
 			/* 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,83 +1,92 @@
-/* $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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * 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.
  */
 #ifndef _SETLOCALE_LOCAL_H_
 #define _SETLOCALE_LOCAL_H_
 #define _LOCALENAME_LEN_MAX 33
 #define _C_LOCALE		"C"
 #define _POSIX_LOCALE		"POSIX"
 extern const char		*_PathLocale;
 #define _LOCALE_ALIAS_NAME	"locale.alias"
 typedef void *_locale_part_t;
 struct _locale_cache_t {
 	const unsigned char *ctype_tab;
 	const short *tolower_tab;
 	const short *toupper_tab;
 	size_t mb_cur_max;
 	struct lconv *ldata;
 	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_*/