svn commit: r218324 - head/bin/sh

[Jilles Tjoelker]

Author: jilles
Date: Sat Feb  5 14:08:51 2011
New Revision: 218324
URL: http://svn.freebsd.org/changeset/base/218324

Log:
  sh: Remove clearcmdentry()'s now unused argument.

Modified:
  head/bin/sh/eval.c
  head/bin/sh/exec.c
  head/bin/sh/exec.h

Modified: head/bin/sh/eval.c
==============================================================================
--- head/bin/sh/eval.c  Sat Feb  5 14:01:46 2011        (r218323)
+++ head/bin/sh/eval.c  Sat Feb  5 14:08:51 2011        (r218324)
@@ -812,7 +812,7 @@ evalcommand(union node *cmd, int flags, 
                                 * 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, 
                                                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);
 }
 

Modified: head/bin/sh/exec.c
==============================================================================
--- head/bin/sh/exec.c  Sat Feb  5 14:01:46 2011        (r218323)
+++ head/bin/sh/exec.c  Sat Feb  5 14:08:51 2011        (r218324)
@@ -234,7 +234,7 @@ hashcmd(int argc __unused, char **argv _
        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 
        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 
        }
 
        if (path != pathval())
-               clearcmdentry(0);
+               clearcmdentry();
 
        return error1;
 }

Modified: head/bin/sh/exec.h
==============================================================================
--- head/bin/sh/exec.h  Sat Feb  5 14:01:46 2011        (r218323)
+++ head/bin/sh/exec.h  Sat Feb  5 14:08:51 2011        (r218324)
@@ -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);
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"