From owner-svn-src-all@FreeBSD.ORG Fri Aug 16 20:24:43 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 66585B88; Fri, 16 Aug 2013 20:24:43 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 44DE62F51; Fri, 16 Aug 2013 20:24:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7GKOhEV043922; Fri, 16 Aug 2013 20:24:43 GMT (envelope-from jilles@svn.freebsd.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7GKOgan043911; Fri, 16 Aug 2013 20:24:42 GMT (envelope-from jilles@svn.freebsd.org) Message-Id: <201308162024.r7GKOgan043911@svn.freebsd.org> From: Jilles Tjoelker Date: Fri, 16 Aug 2013 20:24:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r254426 - head/bin/sh X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Aug 2013 20:24:43 -0000 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);