diff options
| author | Roland McGrath <roland@gnu.org> | 2004-03-25 03:54:03 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2004-03-25 03:54:03 +0000 |
| commit | db2f05ba83cd9eaae24b30166816e5169bbae2c0 (patch) | |
| tree | 0e742754c54aafc31d38af146808d06300a65286 /elf | |
| parent | 61044c288ab5c7c4687205b0bf136e5358bfe1d1 (diff) | |
| download | glibc-db2f05ba83cd9eaae24b30166816e5169bbae2c0.tar glibc-db2f05ba83cd9eaae24b30166816e5169bbae2c0.tar.gz glibc-db2f05ba83cd9eaae24b30166816e5169bbae2c0.tar.bz2 glibc-db2f05ba83cd9eaae24b30166816e5169bbae2c0.zip | |
* 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 'elf')
| -rw-r--r-- | elf/dl-deps.c | 2 | ||||
| -rw-r--r-- | elf/dl-misc.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/elf/dl-deps.c b/elf/dl-deps.c index 1c383b7b98..b8dee8ab52 100644 --- a/elf/dl-deps.c +++ b/elf/dl-deps.c @@ -144,7 +144,7 @@ _dl_map_object_deps (struct link_map *map, struct link_map **preloads, unsigned int npreloads, int trace_mode, int open_mode) { - struct list known[1 + npreloads + 1]; + struct list *known = __alloca (sizeof *known * (1 + npreloads + 1)); struct list *runp, *tail; unsigned int nlist, i; /* Object name. */ diff --git a/elf/dl-misc.c b/elf/dl-misc.c index abc5cbb853..41ef26131d 100644 --- a/elf/dl-misc.c +++ b/elf/dl-misc.c @@ -88,8 +88,8 @@ _dl_sysdep_read_whole_file (const char *file, size_t *sizep, int prot) static void _dl_debug_vdprintf (int fd, int tag_p, const char *fmt, va_list arg) { - const int niovmax = 64; - struct iovec iov[niovmax]; +# define NIOVMAX 64 + struct iovec iov[NIOVMAX]; int niov = 0; pid_t pid = 0; char pidbuf[12]; @@ -115,7 +115,7 @@ _dl_debug_vdprintf (int fd, int tag_p, const char *fmt, va_list arg) } /* Append to the output. */ - assert (niov < niovmax); + assert (niov < NIOVMAX); iov[niov].iov_len = 12; iov[niov++].iov_base = pidbuf; @@ -128,7 +128,7 @@ _dl_debug_vdprintf (int fd, int tag_p, const char *fmt, va_list arg) ++fmt; /* Append constant string. */ - assert (niov < niovmax); + assert (niov < NIOVMAX); if ((iov[niov].iov_len = fmt - startp) != 0) iov[niov++].iov_base = (char *) startp; |