From c059d82290fbc6fdb3a935decaf53336e7e8db98 Mon Sep 17 00:00:00 2001
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Sat, 5 Feb 2011 14:08:51 +0000
Subject: [PATCH] sh: Remove clearcmdentry()'s now unused argument.

---
 bin/sh/eval.c |  6 +++---
 bin/sh/exec.c | 13 ++++++-------
 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 2d3f6310ef8c..793248bf3e79 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 @@ evalcommand(union node *cmd, int flags, struct backcmd *backcmd)
 	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 67eafffe32cc..044fc3031d16 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 45a647e6ff37..392cc335f660 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);