Author: jilles
Date: Fri Aug 16 20:24:41 2013
New Revision: 254426
URL: http://svnweb.freebsd.org/changeset/base/254426
Log:
sh: Remove unnecessary reset functions.
These are already handled by exception handlers.
Modified:
head/bin/sh/eval.c
head/bin/sh/main.c
head/bin/sh/parser.c
head/bin/sh/parser.h
head/bin/sh/redir.c
head/bin/sh/redir.h
Modified: head/bin/sh/eval.c
==============================================================================
--- head/bin/sh/eval.c Fri Aug 16 20:22:57 2013 (r254425)
+++ head/bin/sh/eval.c Fri Aug 16 20:24:41 2013 (r254426)
@@ -109,7 +109,6 @@ reseteval(void)
{
evalskip = 0;
loopnest = 0;
- funcnest = 0;
}
Modified: head/bin/sh/main.c
==============================================================================
--- head/bin/sh/main.c Fri Aug 16 20:22:57 2013 (r254425)
+++ head/bin/sh/main.c Fri Aug 16 20:24:41 2013 (r254426)
@@ -185,8 +185,6 @@ reset(void)
{
reseteval();
resetinput();
- resetparser();
- resetredir();
}
/*
Modified: head/bin/sh/parser.c
==============================================================================
--- head/bin/sh/parser.c Fri Aug 16 20:22:57 2013 (r254425)
+++ head/bin/sh/parser.c Fri Aug 16 20:24:41 2013 (r254426)
@@ -210,6 +210,7 @@ parsecmd(int interact)
heredoclist = NULL;
tokpushback = 0;
+ checkkwd = 0;
doprompt = interact;
if (doprompt)
setprompt(1);
@@ -1822,14 +1823,6 @@ parsearith: {
} /* end of readtoken */
-void
-resetparser(void)
-{
- tokpushback = 0;
- checkkwd = 0;
-}
-
-
/*
* Returns true if the text contains nothing to expand (no dollar signs
* or backquotes).
Modified: head/bin/sh/parser.h
==============================================================================
--- head/bin/sh/parser.h Fri Aug 16 20:22:57 2013 (r254425)
+++ head/bin/sh/parser.h Fri Aug 16 20:24:41 2013 (r254426)
@@ -79,7 +79,6 @@ extern const char *const parsekwd[];
union node *parsecmd(int);
void fixredir(union node *, const char *, int);
-void resetparser(void);
int goodname(const char *);
int isassignment(const char *);
char *getprompt(void *);
Modified: head/bin/sh/redir.c
==============================================================================
--- head/bin/sh/redir.c Fri Aug 16 20:22:57 2013 (r254425)
+++ head/bin/sh/redir.c Fri Aug 16 20:24:41 2013 (r254426)
@@ -319,18 +319,6 @@ popredir(void)
INTON;
}
-/*
- * Undo all redirections. Called on error or interrupt.
- */
-
-void
-resetredir(void)
-{
- while (redirlist)
- popredir();
-}
-
-
/* Return true if fd 0 has already been redirected at least once. */
int
fd0_redirected_p(void)
Modified: head/bin/sh/redir.h
==============================================================================
--- head/bin/sh/redir.h Fri Aug 16 20:22:57 2013 (r254425)
+++ head/bin/sh/redir.h Fri Aug 16 20:24:41 2013 (r254426)
@@ -40,7 +40,6 @@
union node;
void redirect(union node *, int);
void popredir(void);
-void resetredir(void);
int fd0_redirected_p(void);
void clearredir(void);
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
