From db2f05ba83cd9eaae24b30166816e5169bbae2c0 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 25 Mar 2004 03:54:03 +0000 Subject: * 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. --- posix/annexc.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'posix') diff --git a/posix/annexc.c b/posix/annexc.c index 3ade6d4..df5913a 100644 --- a/posix/annexc.c +++ b/posix/annexc.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 2000, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1998, 2000, 2002, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -794,22 +794,15 @@ get_null_defines (void) static int check_header (const struct header *header, const char **except) { - char line[BUFSIZ], *command; + char line[BUFSIZ], command[sizeof fmt + strlen (header->name) + + 2 * strlen (CC) + + strlen (INC) + strlen (macrofile)]; FILE *input; int result = 0; int found[header->nsyms]; int i; memset (found, '\0', header->nsyms * sizeof (int)); - command = alloca (sizeof fmt + strlen (header->name) + 2 * strlen (CC) - + strlen (INC) + strlen (macrofile)); - - - if (command == NULL) - { - puts ("No more memory."); - exit (1); - } printf ("=== %s ===\n", header->name); sprintf (command, fmt, header->name, CC, INC, CC, macrofile); -- cgit v1.1