From 23f5f62d4b31c442f5bd49c64982e4e40935bc33 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 30 Apr 1999 17:44:43 +0000 Subject: Update. 1999-04-30 Andreas Schwab * string/bits/string2.h (memset): Revert to previous version if unaligned writes are not available. 1999-04-30 Ulrich Drepper * sysdeps/i386/i486/bits/string.h (__memset_gc): Help generating better code in presence of the asm. 1999-04-30 Andreas Schwab * stdlib/fmtmsg.c (keywords): Increase array size for faster indexing. * locale/localeinfo.h (_nl_category_names): Increase array element size for faster indexing. * locale/setlocale.c (_nl_category_names): Adjusted. 1999-04-30 Andreas Schwab * iconv/gconv_conf.c (add_alias): Remove wrong cast. --- locale/localeinfo.h | 2 +- locale/setlocale.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'locale') diff --git a/locale/localeinfo.h b/locale/localeinfo.h index 9f58a743c8..dddacfe28d 100644 --- a/locale/localeinfo.h +++ b/locale/localeinfo.h @@ -104,7 +104,7 @@ extern struct locale_data *_nl_current_##category; #include "categories.def" #undef DEFINE_CATEGORY -extern const char _nl_category_names[LC_ALL + 1][12]; +extern const char _nl_category_names[LC_ALL + 1][16]; extern const size_t _nl_category_name_sizes[LC_ALL + 1]; extern struct locale_data * *const _nl_current[LC_ALL + 1]; diff --git a/locale/setlocale.c b/locale/setlocale.c index 1bcc4d5375..5f152e3bba 100644 --- a/locale/setlocale.c +++ b/locale/setlocale.c @@ -66,10 +66,10 @@ struct locale_data *const _nl_C[] = /* Define an array of category names (also the environment variable names), indexed by integral category. - We have entries of fixed width (12 for now) do avoid an array of + We have entries of fixed width (16 for now) do avoid an array of pointers. Update the size of the outer array if new, longer locale names are introduced. */ -const char _nl_category_names[][12] = +const char _nl_category_names[][16] = { #define DEFINE_CATEGORY(category, category_name, items, a, b, c, d) \ [category] = category_name, -- cgit v1.2.3