niansa-misc/glibc
1
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-03-06 20:58:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

argp-parse: Get rid of alloca

Browse source 
Even though the alloca usage is relatively small and fixed size the code
can be written without using alloca.  Convert to local variables.

Checked on x86_64-linux-gnu.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
This commit is contained in:
Joe Simmons-Talbott 2023-08-28 16:49:02 +00:00
parent 4d8b093933
commit 46924663bd
1 changed files with 11 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
argp/argp-parse.c
View file

@ -21,21 +21,6 @@
#include <config.h> #include <config.h>
#endif #endif
/* AIX requires this to be the first thing in the file. */
#ifndef __GNUC__
# if HAVE_ALLOCA_H || defined _LIBC
# include <alloca.h>
# else
# ifdef _AIX
#pragma alloca
# else
# ifndef alloca /* predefined by HP cc +Olibcalls */
char *alloca ();
# endif
# endif
# endif
#endif
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
@ -884,6 +869,9 @@ __argp_parse (const struct argp *argp, int argc, char **argv, unsigned flags,
error_t err; error_t err;
struct parser parser; struct parser parser;
struct argp_child child[4];
struct argp top_argp;
/* If true, then err == EBADKEY is a result of a non-option argument failing /* If true, then err == EBADKEY is a result of a non-option argument failing
to be parsed (which in some cases isn't actually an error). */ to be parsed (which in some cases isn't actually an error). */
int arg_ebadkey = 0; int arg_ebadkey = 0;
@ -891,24 +879,23 @@ __argp_parse (const struct argp *argp, int argc, char **argv, unsigned flags,
if (! (flags & ARGP_NO_HELP)) if (! (flags & ARGP_NO_HELP))
/* Add our own options. */ /* Add our own options. */
{ {
struct argp_child *child = alloca (4 * sizeof (struct argp_child)); int child_index = 0;
struct argp *top_argp = alloca (sizeof (struct argp));
/* TOP_ARGP has no options, it just serves to group the user & default /* TOP_ARGP has no options, it just serves to group the user & default
argps. */ argps. */
memset (top_argp, 0, sizeof (*top_argp)); memset (&top_argp, 0, sizeof (struct argp));
top_argp->children = child; top_argp.children = child;
memset (child, 0, 4 * sizeof (struct argp_child)); memset (child, 0, 4 * sizeof (struct argp_child));
if (argp) if (argp)
(child++)->argp = argp; child[child_index++].argp = argp;
(child++)->argp = &argp_default_argp; child[child_index++].argp = &argp_default_argp;
if (argp_program_version || argp_program_version_hook) if (argp_program_version || argp_program_version_hook)
(child++)->argp = &argp_version_argp; child[child_index++].argp = &argp_version_argp;
child->argp = 0; child[child_index].argp = 0;
argp = top_argp; argp = &top_argp;
} }
/* Construct a parser for these arguments. */ /* Construct a parser for these arguments. */