From 17925ac0b62771ec91a08447116514709db72af5 Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Sun, 22 May 2016 13:24:48 -0400 Subject: Use argc/argv naming consistently. --- eval.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'eval.c') diff --git a/eval.c b/eval.c index 41afedb..808eaf6 100644 --- a/eval.c +++ b/eval.c @@ -307,25 +307,25 @@ err: return NULL; } -static void exec_free_argv(size_t argc, char **argv, char **args) { +static void exec_free_argv(size_t argc, char **argv, char **template) { for (size_t i = 0; i < argc; ++i) { - if (argv[i] != args[i]) { + if (argv[i] != template[i]) { dstrfree(argv[i]); } } free(argv); } -static char **exec_format_argv(size_t argc, char **args, const char *path) { +static char **exec_format_argv(size_t argc, char **template, const char *path) { char **argv = malloc((argc + 1)*sizeof(char *)); if (!argv) { return NULL; } for (size_t i = 0; i < argc; ++i) { - argv[i] = exec_format_arg(args[i], path); + argv[i] = exec_format_arg(template[i], path); if (!argv[i]) { - exec_free_argv(i, argv, args); + exec_free_argv(i, argv, template); return NULL; } } @@ -382,9 +382,9 @@ bool eval_exec(const struct expr *expr, struct eval_state *state) { goto out; } - size_t argc = expr->nargs - 2; - char **args = expr->args + 1; - char **argv = exec_format_argv(argc, args, path); + size_t argc = expr->argc - 2; + char **template = expr->argv + 1; + char **argv = exec_format_argv(argc, template, path); if (!argv) { goto out_path; } @@ -430,7 +430,7 @@ bool eval_exec(const struct expr *expr, struct eval_state *state) { } out_argv: - exec_free_argv(argc, argv, args); + exec_free_argv(argc, argv, template); out_path: exec_free_path(path, ftwbuf); out: -- cgit v1.2.3