diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-07-30 00:00:23 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-07-30 00:00:23 +0000 |
| commit | a9706118e04fc78b7910b5aff08993db709ad43d (patch) | |
| tree | cfdc7748118f887bc965d4121bf488bf8095275b /locale/programs/ld-ctype.c | |
| parent | fb032fbd8888df1391bfb3a43f1a39a7b64d7423 (diff) | |
Update.
2000-07-29 Ulrich Drepper <drepper@redhat.com>
* locale/langinfo.h: Add entries for extra tables in CTYPE data.
* locale/programs/ld-ctype.c: Adjust for this.
* locale/programs/ld-collate.c: Add more alignment checks.
* locale/string/strcoll.c: Likewise.
2000-07-30 Mark Kettenis <kettenis@gnu.org>
* stdio-common/vfprintf.c: Move inclusion of _i18n_number.h
outside USE_IN_LIBIO block.
Diffstat (limited to 'locale/programs/ld-ctype.c')
| -rw-r--r-- | locale/programs/ld-ctype.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c index 1c1c492cb0..f3edd6cbc0 100644 --- a/locale/programs/ld-ctype.c +++ b/locale/programs/ld-ctype.c @@ -838,7 +838,7 @@ ctype_output (struct localedef_t *locale, struct charmap_t *charmap, { static const char nulbytes[4] = { 0, 0, 0, 0 }; struct locale_ctype_t *ctype = locale->categories[LC_CTYPE].ctype; - const size_t nelems = (_NL_ITEM_INDEX (_NL_NUM_LC_CTYPE) + const size_t nelems = (_NL_ITEM_INDEX (_NL_CTYPE_EXTRA_MAP_1) + (oldstyle_tables ? (ctype->map_collection_nr - 2) : (ctype->nr_charclass + ctype->map_collection_nr))); @@ -866,7 +866,7 @@ ctype_output (struct localedef_t *locale, struct charmap_t *charmap, for (elem = 0; elem < nelems; ++elem) { - if (elem < _NL_ITEM_INDEX (_NL_NUM_LC_CTYPE)) + if (elem < _NL_ITEM_INDEX (_NL_CTYPE_EXTRA_MAP_1)) switch (elem) { #define CTYPE_EMPTY(name) \ @@ -1155,7 +1155,7 @@ ctype_output (struct localedef_t *locale, struct charmap_t *charmap, /* Handle extra maps. */ if (oldstyle_tables) { - size_t nr = (elem - _NL_ITEM_INDEX (_NL_NUM_LC_CTYPE)) + 2; + size_t nr = (elem - _NL_ITEM_INDEX (_NL_CTYPE_EXTRA_MAP_1)) + 2; iov[2 + elem + offset].iov_base = ctype->map32[nr]; iov[2 + elem + offset].iov_len = ((ctype->plane_size @@ -1166,7 +1166,7 @@ ctype_output (struct localedef_t *locale, struct charmap_t *charmap, } else { - size_t nr = elem - _NL_ITEM_INDEX (_NL_NUM_LC_CTYPE); + size_t nr = elem - _NL_ITEM_INDEX (_NL_CTYPE_EXTRA_MAP_1); if (nr < ctype->nr_charclass) { iov[2 + elem + offset] = ctype->class_3level[nr]; @@ -4240,7 +4240,7 @@ Computing table size for character classes might take a while..."), } else { - ctype->class_offset = _NL_ITEM_INDEX (_NL_NUM_LC_CTYPE); + ctype->class_offset = _NL_ITEM_INDEX (_NL_CTYPE_EXTRA_MAP_1); ctype->map_offset = ctype->class_offset + ctype->nr_charclass; } |