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, 5 deletions

diff --git a/bin/sh/var.c b/bin/sh/var.c
index a12a568..2c1caf1 100644
--- a/bin/sh/var.c
+++ b/bin/sh/var.c
@@ -193,12 +193,8 @@ int
 setvarsafe(char *name, char *val, int flags)
 {
 	struct jmploc jmploc;
-	struct jmploc *volatile savehandler = handler;
+	struct jmploc *const savehandler = handler;
 	int err = 0;
-#ifdef __GNUC__
-	/* Avoid longjmp clobbering */
-	(void) &err;
-#endif
 
 	if (setjmp(jmploc.loc))
 		err = 1;