diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2001-06-23 23:08:17 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2001-06-23 23:08:17 +0000 |
| commit | e29e1525574ffdd968cdf81100e359e5850a8459 (patch) | |
| tree | f7352b34b721794ac27c3a95a5f674c0bfc2d95b | |
| parent | 966245262d251c90f443a47761efa2715e8dd997 (diff) | |
Remove evil #ifdef __GNUC__ garbage to avoid longjmp clobbering and
use volatile instead.
| -rw-r--r-- | usr.bin/rdist/docmd.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/usr.bin/rdist/docmd.c b/usr.bin/rdist/docmd.c index 3252a4eed55..104374469c3 100644 --- a/usr.bin/rdist/docmd.c +++ b/usr.bin/rdist/docmd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: docmd.c,v 1.8 1999/02/04 23:18:57 millert Exp $ */ +/* $OpenBSD: docmd.c,v 1.9 2001/06/23 23:08:16 millert Exp $ */ /* * Copyright (c) 1983 Regents of the University of California. @@ -39,7 +39,7 @@ static char RCSid[] = "$From: docmd.c,v 6.86 1996/01/30 02:29:43 mcooper Exp $"; #else static char RCSid[] = -"$OpenBSD: docmd.c,v 1.8 1999/02/04 23:18:57 millert Exp $"; +"$OpenBSD: docmd.c,v 1.9 2001/06/23 23:08:16 millert Exp $"; #endif static char sccsid[] = "@(#)docmd.c 5.1 (Berkeley) 6/6/85"; @@ -434,16 +434,12 @@ static void doarrow(cmd, filev) register struct namelist *f; register struct subcmd *sc; register char **cpp; - int n, ddir, destdir, opts = options; + int n, ddir, destdir; struct namelist *files; struct subcmd *sbcmds; char *rhost; - int didupdate = 0; - -#ifdef __GNUC__ - (void)&didupdate; - (void)&opts; -#endif + volatile int opts = options; + volatile int didupdate = 0; if (setjmp_ok) { error("reentrant call to doarrow"); |