diff options
author | jilles <jilles@FreeBSD.org> | 2011-02-05 14:08:51 +0000 |
---|---|---|
committer | jilles <jilles@FreeBSD.org> | 2011-02-05 14:08:51 +0000 |
commit | 9a75a8c404567dc1fee863ef113ddf6ead6fd02f (patch) | |
tree | de8eba5bf5591f990e9cf7a5183ec0c95e6b788f /bin/sh | |
parent | 852a80acf72e4c96489249a2958546b2155b3f2b (diff) | |
download | FreeBSD-src-9a75a8c404567dc1fee863ef113ddf6ead6fd02f.zip FreeBSD-src-9a75a8c404567dc1fee863ef113ddf6ead6fd02f.tar.gz |
sh: Remove clearcmdentry()'s now unused argument.
Diffstat (limited to 'bin/sh')
-rw-r--r-- | bin/sh/eval.c | 6 | ||||
-rw-r--r-- | bin/sh/exec.c | 13 | ||||
-rw-r--r-- | bin/sh/exec.h | 2 |
3 files changed, 10 insertions, 11 deletions
diff --git a/bin/sh/eval.c b/bin/sh/eval.c index 2d3f631..793248b 100644 --- a/bin/sh/eval.c +++ b/bin/sh/eval.c @@ -812,7 +812,7 @@ evalcommand(union node *cmd, int flags, struct backcmd *backcmd) * bookinging effort, since most such runs add * directories in front of the new PATH. */ - clearcmdentry(0); + clearcmdentry(); do_clearcmdentry = 1; } @@ -854,7 +854,7 @@ evalcommand(union node *cmd, int flags, struct backcmd *backcmd) argc -= 2; } path = _PATH_STDPATH; - clearcmdentry(0); + clearcmdentry(); do_clearcmdentry = 1; } else if (!strcmp(argv[1], "--")) { if (argc == 2) @@ -1061,7 +1061,7 @@ out: if (lastarg) setvar("_", lastarg, 0); if (do_clearcmdentry) - clearcmdentry(0); + clearcmdentry(); popstackmark(&smark); } diff --git a/bin/sh/exec.c b/bin/sh/exec.c index 67eafff..044fc30 100644 --- a/bin/sh/exec.c +++ b/bin/sh/exec.c @@ -234,7 +234,7 @@ hashcmd(int argc __unused, char **argv __unused) verbose = 0; while ((c = nextopt("rv")) != '\0') { if (c == 'r') { - clearcmdentry(0); + clearcmdentry(); } else if (c == 'v') { verbose++; } @@ -494,7 +494,7 @@ hashcd(void) void changepath(const char *newval) { - clearcmdentry(0); + clearcmdentry(); } @@ -504,7 +504,7 @@ changepath(const char *newval) */ void -clearcmdentry(int firstchange) +clearcmdentry(void) { struct tblentry **tblp; struct tblentry **pp; @@ -514,8 +514,7 @@ clearcmdentry(int firstchange) for (tblp = cmdtable ; tblp < &cmdtable[CMDTABLESIZE] ; tblp++) { pp = tblp; while ((cmdp = *pp) != NULL) { - if ((cmdp->cmdtype == CMDNORMAL && - cmdp->param.index >= firstchange)) { + if (cmdp->cmdtype == CMDNORMAL) { *pp = cmdp->next; ckfree(cmdp); } else { @@ -660,7 +659,7 @@ typecmd_impl(int argc, char **argv, int cmd, const char *path) int error1 = 0; if (path != pathval()) - clearcmdentry(0); + clearcmdentry(); for (i = 1; i < argc; i++) { /* First look at the keywords */ @@ -756,7 +755,7 @@ typecmd_impl(int argc, char **argv, int cmd, const char *path) } if (path != pathval()) - clearcmdentry(0); + clearcmdentry(); return error1; } diff --git a/bin/sh/exec.h b/bin/sh/exec.h index 45a647e..392cc33 100644 --- a/bin/sh/exec.h +++ b/bin/sh/exec.h @@ -76,4 +76,4 @@ void defun(const char *, union node *); int unsetfunc(const char *); int typecmd_impl(int, char **, int, const char *); int typecmd(int, char **); -void clearcmdentry(int); +void clearcmdentry(void); |