diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2001-11-17 19:54:58 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2001-11-17 19:54:58 +0000 |
| commit | 3098cdb2aeca6d121a47df0401bd9d64682b3e9c (patch) | |
| tree | cff90396a2f6df9ced0c2d1ac2cadc0c7877bc1c /sbin | |
| parent | 5c3512bff36556eb83c2abecbf32b9ccdab08c9f (diff) | |
volatile sig_atomic_t
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/mountd/mountd.c | 6 | ||||
| -rw-r--r-- | sbin/photurisd/config.c | 6 | ||||
| -rw-r--r-- | sbin/photurisd/server.c | 6 | ||||
| -rw-r--r-- | sbin/ping6/ping6.c | 10 |
4 files changed, 13 insertions, 15 deletions
diff --git a/sbin/mountd/mountd.c b/sbin/mountd/mountd.c index ef90fcbd72b..e6e5b2075b2 100644 --- a/sbin/mountd/mountd.c +++ b/sbin/mountd/mountd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mountd.c,v 1.39 2001/11/05 07:39:16 mpech Exp $ */ +/* $OpenBSD: mountd.c,v 1.40 2001/11/17 19:54:57 deraadt Exp $ */ /* $NetBSD: mountd.c,v 1.31 1996/02/18 11:57:53 fvdl Exp $ */ /* @@ -216,8 +216,8 @@ int opt_flags; int debug = 0; -sig_atomic_t gothup; -sig_atomic_t gotterm; +volatile sig_atomic_t gothup; +volatile sig_atomic_t gotterm; /* * Mountd server for NFS mount protocol as described in: diff --git a/sbin/photurisd/config.c b/sbin/photurisd/config.c index 6c301e5fee4..b2bf7a950a1 100644 --- a/sbin/photurisd/config.c +++ b/sbin/photurisd/config.c @@ -1,4 +1,4 @@ -/* $OpenBSD: config.c,v 1.7 2001/01/28 22:45:07 niklas Exp $ */ +/* $OpenBSD: config.c,v 1.8 2001/11/17 19:54:57 deraadt Exp $ */ /* * Copyright 1997-2000 Niels Provos <provos@citi.umich.edu> @@ -35,7 +35,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: config.c,v 1.7 2001/01/28 22:45:07 niklas Exp $"; +static char rcsid[] = "$OpenBSD: config.c,v 1.8 2001/11/17 19:54:57 deraadt Exp $"; #endif #define _CONFIG_C_ @@ -749,7 +749,7 @@ reconfig(int sig) init_identities(NULL, NULL); } -sig_atomic_t wantconfig; +volatile sig_atomic_t wantconfig; void sigconfig(int sig) diff --git a/sbin/photurisd/server.c b/sbin/photurisd/server.c index 2b9320d13b8..0c8c8dad523 100644 --- a/sbin/photurisd/server.c +++ b/sbin/photurisd/server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server.c,v 1.9 2001/01/28 22:45:17 niklas Exp $ */ +/* $OpenBSD: server.c,v 1.10 2001/11/17 19:54:57 deraadt Exp $ */ /* * Copyright 1997-2000 Niels Provos <provos@citi.umich.edu> @@ -37,7 +37,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: server.c,v 1.9 2001/01/28 22:45:17 niklas Exp $"; +static char rcsid[] = "$OpenBSD: server.c,v 1.10 2001/11/17 19:54:57 deraadt Exp $"; #endif #define _SERVER_C_ @@ -275,7 +275,7 @@ server(void) FD_SET(sockets[i], normfds); while (1) { - extern sig_atomic_t wantconfig; + extern volatile sig_atomic_t wantconfig; if (wantconfig) { reconfig(0); diff --git a/sbin/ping6/ping6.c b/sbin/ping6/ping6.c index a0a828c9be2..405c2d9672f 100644 --- a/sbin/ping6/ping6.c +++ b/sbin/ping6/ping6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ping6.c,v 1.38 2001/11/05 07:54:44 itojun Exp $ */ +/* $OpenBSD: ping6.c,v 1.39 2001/11/17 19:54:57 deraadt Exp $ */ /* $KAME: ping6.c,v 1.129 2001/06/22 13:16:02 itojun Exp $ */ /* @@ -247,7 +247,6 @@ struct msghdr smsghdr; struct iovec smsgiov; char *scmsg = 0; -volatile int signo; volatile sig_atomic_t seenalrm; volatile sig_atomic_t seenint; #ifdef SIGINFO @@ -999,7 +998,7 @@ main(argc, argv) if ((fdmaskp = malloc(fdmasks)) == NULL) err(1, "malloc"); - signo = seenalrm = seenint = 0; + seenalrm = seenint = 0; #ifdef SIGINFO seeninfo = 0; #endif @@ -1097,10 +1096,9 @@ main(argc, argv) void onsignal(sig) - int sig; + int signo; { - signo = sig; - switch (sig) { + switch (signo) { case SIGALRM: seenalrm++; break; |