summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2001-06-23 23:09:32 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2001-06-23 23:09:32 +0000
commit264ed7ade4b9a92ba0f17dc4c3670fc0dd00454e (patch)
tree4c0b0e62109234caee9993e9892af61399ec9117
parente29e1525574ffdd968cdf81100e359e5850a8459 (diff)
Remove evil #ifdef __GNUC__ garbage to avoid longjmp clobbering and
use volatile instead.
-rw-r--r--usr.bin/xinstall/xinstall.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c
index c755197500e..2b95eb38c31 100644
--- a/usr.bin/xinstall/xinstall.c
+++ b/usr.bin/xinstall/xinstall.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xinstall.c,v 1.25 2000/12/22 11:53:17 jj Exp $ */
+/* $OpenBSD: xinstall.c,v 1.26 2001/06/23 23:09:31 millert Exp $ */
/* $NetBSD: xinstall.c,v 1.9 1995/12/20 10:25:17 jonathan Exp $ */
/*
@@ -44,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)xinstall.c 8.1 (Berkeley) 7/21/93";
#endif
-static char rcsid[] = "$OpenBSD: xinstall.c,v 1.25 2000/12/22 11:53:17 jj Exp $";
+static char rcsid[] = "$OpenBSD: xinstall.c,v 1.26 2001/06/23 23:09:31 millert Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -550,11 +550,7 @@ strip(to_name)
char *to_name;
{
int serrno, status;
- char *path_strip;
-
-#ifdef __GNUC__ /* XXX: to shut up gcc warnings */
- (void)&path_strip;
-#endif
+ char * volatile path_strip;
if (issetugid() || (path_strip = getenv("STRIP")) == NULL)
path_strip = _PATH_STRIP;