sh: Improve handling of setjmp/longjmp volatile:

- remove ineffective and unnecessary (void) &var; [1]
- remove some unnecessary volatile keywords
- add a necessary volatile keyword
- save the old handler before doing something that could use the saved
  value

Submitted by:	Christoph Mallon [1]
Approved by:	ed (mentor)

1 files changed, 1 insertions, 19 deletions

diff --git a/bin/sh/parser.c b/bin/sh/parser.c
index d17dc1a..54a80a7 100644
--- a/bin/sh/parser.c
+++ b/bin/sh/parser.c
@@ -898,19 +898,6 @@ readtoken1(int firstc, char const *syntax, char *eofmark, int striptabs)
 	int oldstyle;
 	char const *prevsyntax;	/* syntax before arithmetic */
 	int synentry;
-#ifdef __GNUC__
-	/* Avoid longjmp clobbering */
-	(void) &out;
-	(void) &quotef;
-	(void) &dblquote;
-	(void) &varnest;
-	(void) &arinest;
-	(void) &parenlevel;
-	(void) &oldstyle;
-	(void) &prevsyntax;
-	(void) &syntax;
-	(void) &synentry;
-#endif
 
 	startlinno = plinno;
 	dblquote = 0;
@@ -1320,13 +1307,9 @@ parsebackq: {
 	union node *n;
 	char *volatile str;
 	struct jmploc jmploc;
-	struct jmploc *volatile savehandler;
+	struct jmploc *const savehandler = handler;
 	int savelen;
 	int saveprompt;
-#ifdef __GNUC__
-	/* Avoid longjmp clobbering */
-	(void) &saveprompt;
-#endif
 
 	savepbq = parsebackquote;
 	if (setjmp(jmploc.loc)) {
@@ -1343,7 +1326,6 @@ parsebackq: {
 		str = ckmalloc(savelen);
 		memcpy(str, stackblock(), savelen);
 	}
-	savehandler = handler;
 	handler = &jmploc;
 	INTON;
         if (oldstyle) {