* locale/loadlocale.c (_nl_value_types): Mark as const.

* iconv/gconv_conf.c (builtin_aliases): Likewise.
This commit is contained in:
Ulrich Drepper 2005-12-20 16:35:25 +00:00
parent 8da21f96b5
commit aa87e9156d
3 changed files with 17 additions and 5 deletions

View File

@ -1,6 +1,7 @@
2005-12-20 Ulrich Drepper <drepper@redhat.com> 2005-12-20 Ulrich Drepper <drepper@redhat.com>
* iconv/gconv_conf.c (builtin_aliases): Mark as const. * locale/loadlocale.c (_nl_value_types): Mark as const.
* iconv/gconv_conf.c (builtin_aliases): Likewise.
* iconv/gconv_open.c (internal_trans_names): Likewise. * iconv/gconv_open.c (internal_trans_names): Likewise.
2005-12-19 Kaz Kojima <kkojima@rr.iij4u.or.jp> 2005-12-19 Kaz Kojima <kkojima@rr.iij4u.or.jp>

View File

@ -1,5 +1,5 @@
/* Cache handling for iconv modules. /* Cache handling for iconv modules.
Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 2001. Contributed by Ulrich Drepper <drepper@cygnus.com>, 2001.
@ -209,7 +209,18 @@ find_module (const char *directory, const char *filename,
/* Call the init function. */ /* Call the init function. */
if (result->__init_fct != NULL) if (result->__init_fct != NULL)
status = DL_CALL_FCT (result->__init_fct, (result)); {
__gconv_init_fct init_fct = result->__init_fct;
#ifdef PTR_DEMANGLE
PTR_DEMANGLE (init_fct);
#endif
status = DL_CALL_FCT (init_fct, (result));
#ifdef PTR_MANGLE
if (result->__btowc_fct != NULL)
PTR_MANGLE (result->__btowc_fct);
#endif
}
} }
return status; return status;

View File

@ -1,5 +1,5 @@
/* Functions to read locale data files. /* Functions to read locale data files.
Copyright (C) 1996-2001, 2002, 2003, 2004 Free Software Foundation, Inc. Copyright (C) 1996-2004, 2005 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
@ -52,7 +52,7 @@ static const enum value_type _nl_value_type_##category[] = { NO_PAREN items };
#include "categories.def" #include "categories.def"
#undef DEFINE_CATEGORY #undef DEFINE_CATEGORY
static const enum value_type *_nl_value_types[] = static const enum value_type *const _nl_value_types[] =
{ {
#define DEFINE_CATEGORY(category, category_name, items, a) \ #define DEFINE_CATEGORY(category, category_name, items, a) \
[category] = _nl_value_type_##category, [category] = _nl_value_type_##category,