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. --- nis/nis_print_group_entry.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'nis') diff --git a/nis/nis_print_group_entry.c b/nis/nis_print_group_entry.c index b32b3c2a37..6f0ba8fbd4 100644 --- a/nis/nis_print_group_entry.c +++ b/nis/nis_print_group_entry.c @@ -1,4 +1,4 @@ -/* Copyright (c) 1997, 1998, 2000 Free Software Foundation, Inc. +/* Copyright (c) 1997, 1998, 2000, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk , 1997. @@ -31,10 +31,6 @@ nis_print_group_entry (const_nis_name group) char buf[grouplen + 50]; char leafbuf[grouplen + 3]; char domainbuf[grouplen + 3]; - unsigned long mem_exp_cnt = 0, mem_imp_cnt = 0, mem_rec_cnt = 0; - unsigned long nomem_exp_cnt = 0, nomem_imp_cnt = 0, nomem_rec_cnt = 0; - char **mem_exp, **mem_imp, **mem_rec; - char **nomem_exp, **nomem_imp, **nomem_rec; nis_result *res; char *cp, *cp2; u_int i; @@ -56,12 +52,14 @@ nis_print_group_entry (const_nis_name group) (__type_of (NIS_RES_OBJECT (res)) != NIS_GROUP_OBJ)) return; - mem_exp = alloca (sizeof (char *) * NIS_RES_NUMOBJ (res)); - mem_imp = alloca (sizeof (char *) * NIS_RES_NUMOBJ (res)); - mem_rec = alloca (sizeof (char *) * NIS_RES_NUMOBJ (res)); - nomem_exp = alloca (sizeof (char *) * NIS_RES_NUMOBJ (res)); - nomem_imp = alloca (sizeof (char *) * NIS_RES_NUMOBJ (res)); - nomem_rec = alloca (sizeof (char *) * NIS_RES_NUMOBJ (res)); + char *mem_exp[NIS_RES_NUMOBJ (res)]; + char *mem_imp[NIS_RES_NUMOBJ (res)]; + char *mem_rec[NIS_RES_NUMOBJ (res)]; + char *nomem_exp[NIS_RES_NUMOBJ (res)]; + char *nomem_imp[NIS_RES_NUMOBJ (res)]; + char *nomem_rec[NIS_RES_NUMOBJ (res)]; + unsigned long mem_exp_cnt = 0, mem_imp_cnt = 0, mem_rec_cnt = 0; + unsigned long nomem_exp_cnt = 0, nomem_imp_cnt = 0, nomem_rec_cnt = 0; for (i = 0; i < NIS_RES_OBJECT (res)->GR_data.gr_members.gr_members_len; ++i) -- cgit v1.2.3