aboutsummaryrefslogtreecommitdiff
path: root/locale/programs/ld-time.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2004-03-25 03:54:03 +0000
committerRoland McGrath <roland@gnu.org>2004-03-25 03:54:03 +0000
commitdb2f05ba83cd9eaae24b30166816e5169bbae2c0 (patch)
tree0e742754c54aafc31d38af146808d06300a65286 /locale/programs/ld-time.c
parent61044c288ab5c7c4687205b0bf136e5358bfe1d1 (diff)
downloadglibc-db2f05ba83cd9eaae24b30166816e5169bbae2c0.zip
glibc-db2f05ba83cd9eaae24b30166816e5169bbae2c0.tar.gz
glibc-db2f05ba83cd9eaae24b30166816e5169bbae2c0.tar.bz2
* Makerules ($(common-objpfx)shlib.lds): Don't use \n in rhs of sed
substitutions; the semicolon terminators are enough for ld anyway. * elf/dl-deps.c (_dl_map_object_deps): Use alloca instead of dynamically sized auto array in function already using alloca. * locale/programs/ld-ctype.c (ctype_output): Likewise. * locale/programs/ld-time.c (time_output): Likewise. * elf/dl-misc.c (_dl_debug_vdprintf): Use macro instead of const for IOV array size. * locale/programs/charmap.c (charmap_read): Avoid alloca (or strdupa) when also using dynamically-sized auto array. * locale/programs/locfile.c (locfile_read): Likewise. * locale/programs/repertoire.c (repertoire_read): Likewise. * nis/nis_print_group_entry.c (nis_print_group_entry): Likewise. * locale/programs/locarchive.c (enlarge_archive): Likewise. * posix/annexc.c (check_header): Likewise. * iconv/gconv_int.h (norm_add_slashes): Don't handle null SUFFIX. strlen ("") gets optimized away just as well. * intl/loadmsgcat.c (_nl_init_domain_conv): Update caller. * wcsmbs/wcsmbsload.c (__wcsmbs_load_conv): Likewise.
Diffstat (limited to 'locale/programs/ld-time.c')
-rw-r--r--locale/programs/ld-time.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/locale/programs/ld-time.c b/locale/programs/ld-time.c
index f0a0f0f..a7dd25c 100644
--- a/locale/programs/ld-time.c
+++ b/locale/programs/ld-time.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995-2002, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1995-2002, 2003, 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@gnu.org>, 1995.
@@ -528,10 +528,11 @@ time_output (struct localedef_t *locale, const struct charmap_t *charmap,
const char *output_path)
{
struct locale_time_t *time = locale->categories[LC_TIME].time;
- struct iovec iov[2 + _NL_ITEM_INDEX (_NL_NUM_LC_TIME)
- + time->num_era - 1
- + 2 * 99
- + 2 + time->num_era * 10 - 1];
+ struct iovec *iov = alloca (sizeof *iov
+ * (2 + _NL_ITEM_INDEX (_NL_NUM_LC_TIME)
+ + time->num_era - 1
+ + 2 * 99
+ + 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;