From 19358cc31317dca4642417066c1445ce00438e18 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Sun, 5 Aug 2018 15:42:29 +0200 Subject: ash,hush: fold shell_builtin_read() way-too-many params into a struct param function old new delta getoptscmd 587 584 -3 readcmd 240 224 -16 shell_builtin_read 1426 1399 -27 builtin_read 210 182 -28 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 0/4 up/down: 0/-74) Total: -74 bytes Signed-off-by: Denys Vlasenko --- shell/shell_common.h | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'shell/shell_common.h') diff --git a/shell/shell_common.h b/shell/shell_common.h index 875fd9ea7..a1323021d 100644 --- a/shell/shell_common.h +++ b/shell/shell_common.h @@ -30,6 +30,17 @@ int FAST_FUNC is_well_formed_var_name(const char *s, char terminator); /* Builtins */ +struct builtin_read_params { + int read_flags; + void FAST_FUNC (*setvar)(const char *name, const char *val); + char **argv; + const char *ifs; + const char *opt_n; + const char *opt_p; + const char *opt_t; + const char *opt_u; + const char *opt_d; +}; enum { BUILTIN_READ_SILENT = 1 << 0, BUILTIN_READ_RAW = 1 << 1, @@ -40,16 +51,7 @@ enum { // shell_builtin_read(setvar,argv,ifs,read_flags) //#endif const char* FAST_FUNC -shell_builtin_read(void FAST_FUNC (*setvar)(const char *name, const char *val), - char **argv, - const char *ifs, - int read_flags, - const char *opt_n, - const char *opt_p, - const char *opt_t, - const char *opt_u, - const char *opt_d -); +shell_builtin_read(struct builtin_read_params *params); int FAST_FUNC shell_builtin_ulimit(char **argv); -- cgit v1.2.3