summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2002-01-09 00:51:01 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2002-01-09 00:51:01 +0000
commit8f6f3c09d44ebcd48f183ce18a499829b843696a (patch)
tree8fdd281abe72ba3a8cc4a88a3f06b03050e91544
parent55dfba72b054162f665c0d1c0dcd9c207f312ba2 (diff)
Kill volatile now that jongjmp is history.
-rw-r--r--usr.sbin/cron/do_command.c10
-rw-r--r--usr.sbin/cron/popen.c6
2 files changed, 8 insertions, 8 deletions
diff --git a/usr.sbin/cron/do_command.c b/usr.sbin/cron/do_command.c
index c3c70bcf4a4..5f5d1c88b49 100644
--- a/usr.sbin/cron/do_command.c
+++ b/usr.sbin/cron/do_command.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: do_command.c,v 1.11 2001/10/24 17:28:16 millert Exp $ */
+/* $OpenBSD: do_command.c,v 1.12 2002/01/09 00:51:00 millert Exp $ */
/* Copyright 1988,1990,1993,1994 by Paul Vixie
* All rights reserved
*/
@@ -21,7 +21,7 @@
*/
#if !defined(lint) && !defined(LINT)
-static char rcsid[] = "$OpenBSD: do_command.c,v 1.11 2001/10/24 17:28:16 millert Exp $";
+static char rcsid[] = "$OpenBSD: do_command.c,v 1.12 2002/01/09 00:51:00 millert Exp $";
#endif
#include "cron.h"
@@ -65,8 +65,8 @@ static void
child_process(entry *e, user *u) {
int stdin_pipe[2], stdout_pipe[2];
char *usernm;
- char * volatile input_data, * volatile mailto;
- volatile int children = 0;
+ char *input_data, *mailto;
+ int children = 0;
Debug(DPROC, ("[%ld] child_process('%s')\n", (long)getpid(), e->cmd))
@@ -361,7 +361,7 @@ child_process(entry *e, user *u) {
int ch = getc(in);
if (ch != EOF) {
- FILE * volatile mail;
+ FILE *mail;
int bytes = 1;
int status = 0;
diff --git a/usr.sbin/cron/popen.c b/usr.sbin/cron/popen.c
index 2e922a11067..3a5722face1 100644
--- a/usr.sbin/cron/popen.c
+++ b/usr.sbin/cron/popen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: popen.c,v 1.12 2001/10/24 17:28:16 millert Exp $ */
+/* $OpenBSD: popen.c,v 1.13 2002/01/09 00:51:00 millert Exp $ */
/*
* Copyright (c) 1988, 1993, 1994
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)popen.c 8.3 (Berkeley) 4/6/94";
#else
-static char rcsid[] = "$OpenBSD: popen.c,v 1.12 2001/10/24 17:28:16 millert Exp $";
+static char rcsid[] = "$OpenBSD: popen.c,v 1.13 2002/01/09 00:51:00 millert Exp $";
#endif
#endif /* not lint */
@@ -63,7 +63,7 @@ cron_popen(program, type, e)
entry *e;
{
char *cp;
- FILE * volatile iop;
+ FILE *iop;
int argc, pdes[2];
PID_T pid;
char *argv[MAX_ARGV];