diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-04-21 03:43:31 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-04-21 03:43:31 +0000 |
| commit | a0edd63e7c41336220353a6055662f38f5429a50 (patch) | |
| tree | aba5d9cb1144e26c93d610a7ae7a5d4569416a6f /locale/programs/ld-time.c | |
| parent | dfcaa6429a6cecc15ed49b5a92474c1f54f693c4 (diff) | |
| download | glibc-a0edd63e7c41336220353a6055662f38f5429a50.tar glibc-a0edd63e7c41336220353a6055662f38f5429a50.tar.gz glibc-a0edd63e7c41336220353a6055662f38f5429a50.tar.bz2 glibc-a0edd63e7c41336220353a6055662f38f5429a50.zip | |
Update.
2000-04-19 Jakub Jelinek <jakub@redhat.com>
* locale/programs/ld-ctype.c (ctype_output): Set size of the idx
field to nelems * sizeof (uint32_t).
* locale/programs/ld-address.c (address_output): Align word fields
properly.
* locale/programs/ld-monetary.c (monetary_output): Likewise.
Don't restart idx pointers to idx end at the duo_int_curr_symbol
field.
Avoid giving arbitrary garbage in the crncystr field.
Use sizeof(uint32_t) instead of 4 for len in uno_valid_from,
uno_valid_to, duo_valid_from, duo_valid_to and conversion_rate
fields.
* locale/programs/ld-numeric.c (numeric_output): Likewise.
Don't restart idx pointers to idx end at the decimal_point_wc field.
* locale/programs/ld-time.c (time_output): week_1stday should be
word, not byte. Align it properly.
2000-04-19 H.J. Lu <hjl@gnu.org>
* csu/gmon-start.c (_start): Declared as "extern void".
(etext): Likewise.
2000-04-18 Andreas Jaeger <aj@suse.de>
* manual/install.texi (Running make install): Don't mention utmpd
anymore.
2000-04-18 Andreas Jaeger <aj@suse.de>
* linuxthreads/Versions: Use ld instead of ld.so.
* elf/Makefile (ld-map): Use ld.map.
* Versions.def: Use ld instead of ld.so.
* elf/Versions: Likewise.
* sysdeps/mach/hurd/Versions: Likewise.
Diffstat (limited to 'locale/programs/ld-time.c')
| -rw-r--r-- | locale/programs/ld-time.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/locale/programs/ld-time.c b/locale/programs/ld-time.c index 99e029c755..b42dba0100 100644 --- a/locale/programs/ld-time.c +++ b/locale/programs/ld-time.c @@ -502,7 +502,7 @@ time_output (struct localedef_t *locale, struct charmap_t *charmap, struct iovec iov[2 + _NL_ITEM_INDEX (_NL_NUM_LC_TIME) + time->num_era - 1 + 2 * 99 - + 1 + time->num_era * 10 - 1]; + + 2 + time->num_era * 10 - 1]; struct locale_file data; uint32_t idx[_NL_ITEM_INDEX (_NL_NUM_LC_TIME)]; size_t cnt, last_idx, num, n; @@ -811,8 +811,14 @@ time_output (struct localedef_t *locale, struct charmap_t *charmap, ++cnt; ++last_idx; + /* We must align the following data. */ + iov[2 + cnt].iov_base = (void *) "\0\0"; + iov[2 + cnt].iov_len = ((idx[last_idx] + 3) & ~3) - idx[last_idx]; + idx[last_idx] = (idx[last_idx] + 3) & ~3; + ++cnt; + iov[2 + cnt].iov_base = (void *) &time->week_1stday; - iov[2 + cnt].iov_len = 1; + iov[2 + cnt].iov_len = sizeof(uint32_t); idx[1 + last_idx] = idx[last_idx] + iov[2 + cnt].iov_len; ++cnt; ++last_idx; @@ -849,7 +855,7 @@ time_output (struct localedef_t *locale, struct charmap_t *charmap, assert (cnt == (_NL_ITEM_INDEX (_NL_NUM_LC_TIME) + time->num_era - 1 + 2 * 99 - + 1 + time->num_era * 10 - 1)); + + 2 + time->num_era * 10 - 1)); assert (last_idx == _NL_ITEM_INDEX (_NL_NUM_LC_TIME)); write_locale_data (output_path, "LC_TIME", 2 + cnt, iov); |