summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sbin/dump/optr.c4
-rw-r--r--sbin/isakmpd/policy.c6
-rw-r--r--usr.bin/rdistd/server.c4
-rw-r--r--usr.bin/write/write.c4
-rw-r--r--usr.sbin/syslogd/syslogd.c4
-rw-r--r--usr.sbin/yppoll/yppoll.c4
6 files changed, 13 insertions, 13 deletions
diff --git a/sbin/dump/optr.c b/sbin/dump/optr.c
index f4564c29c2a..06568d5b611 100644
--- a/sbin/dump/optr.c
+++ b/sbin/dump/optr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: optr.c,v 1.31 2009/10/27 23:59:32 deraadt Exp $ */
+/* $OpenBSD: optr.c,v 1.32 2013/04/16 19:25:59 deraadt Exp $ */
/* $NetBSD: optr.c,v 1.11 1997/05/27 08:34:36 mrg Exp $ */
/*-
@@ -201,7 +201,7 @@ timeest(void)
{
time_t tnow, deltat;
- (void) time((time_t *) &tnow);
+ (void) time(&tnow);
if (tnow >= tschedule) {
tschedule = tnow + 300;
if (blockswritten < 500)
diff --git a/sbin/isakmpd/policy.c b/sbin/isakmpd/policy.c
index 83c44f5687b..8230a549428 100644
--- a/sbin/isakmpd/policy.c
+++ b/sbin/isakmpd/policy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: policy.c,v 1.95 2013/03/21 04:30:14 deraadt Exp $ */
+/* $OpenBSD: policy.c,v 1.96 2013/04/16 19:26:00 deraadt Exp $ */
/* $EOM: policy.c,v 1.49 2000/10/24 13:33:39 niklas Exp $ */
/*
@@ -1736,12 +1736,12 @@ policy_callback(char *name)
return phase_1;
if (strcmp(name, "GMTTimeOfDay") == 0) {
- tt = time((time_t *)NULL);
+ tt = time(NULL);
strftime(mytimeofday, 14, "%Y%m%d%H%M%S", gmtime(&tt));
return mytimeofday;
}
if (strcmp(name, "LocalTimeOfDay") == 0) {
- tt = time((time_t *)NULL);
+ tt = time(NULL);
strftime(mytimeofday, 14, "%Y%m%d%H%M%S", localtime(&tt));
return mytimeofday;
}
diff --git a/usr.bin/rdistd/server.c b/usr.bin/rdistd/server.c
index 59b1a775ef4..77b1217eb73 100644
--- a/usr.bin/rdistd/server.c
+++ b/usr.bin/rdistd/server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server.c,v 1.23 2012/11/12 01:14:41 guenther Exp $ */
+/* $OpenBSD: server.c,v 1.24 2013/04/16 19:24:53 deraadt Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -902,7 +902,7 @@ recvfile(char *new, opt_t opts, int mode, char *owner, char *group,
* Perform utimes() after file is closed to make
* certain OS's, such as NeXT 2.1, happy.
*/
- if (setfiletime(new, time((time_t *) 0), mtime) < 0)
+ if (setfiletime(new, time(NULL), mtime) < 0)
message(MT_NOTICE, "%s: utimes failed: %s", new, SYSERR);
/*
diff --git a/usr.bin/write/write.c b/usr.bin/write/write.c
index 02207705ad4..321bb42a5c0 100644
--- a/usr.bin/write/write.c
+++ b/usr.bin/write/write.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: write.c,v 1.26 2009/10/27 23:59:50 deraadt Exp $ */
+/* $OpenBSD: write.c,v 1.27 2013/04/16 19:24:55 deraadt Exp $ */
/* $NetBSD: write.c,v 1.5 1995/08/31 21:48:32 jtc Exp $ */
/*
@@ -252,7 +252,7 @@ do_write(char *tty, char *mytty, uid_t myuid)
/* print greeting */
if (gethostname(host, sizeof(host)) < 0)
(void)strlcpy(host, "???", sizeof host);
- now = time((time_t *)NULL);
+ now = time(NULL);
nows = ctime(&now);
nows[16] = '\0';
(void)printf("\r\n\007\007\007Message from %s@%s on %s at %s ...\r\n",
diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c
index 175a52a337c..64cf528c253 100644
--- a/usr.sbin/syslogd/syslogd.c
+++ b/usr.sbin/syslogd/syslogd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: syslogd.c,v 1.106 2013/03/11 17:40:11 deraadt Exp $ */
+/* $OpenBSD: syslogd.c,v 1.107 2013/04/16 19:24:55 deraadt Exp $ */
/*
* Copyright (c) 1983, 1988, 1993, 1994
@@ -1686,7 +1686,7 @@ markit(void)
{
struct filed *f;
- now = time((time_t *)NULL);
+ now = time(NULL);
MarkSeq += TIMERINTVL;
if (MarkSeq >= MarkInterval) {
logmsg(LOG_INFO, "-- MARK --",
diff --git a/usr.sbin/yppoll/yppoll.c b/usr.sbin/yppoll/yppoll.c
index df84e2fa125..6cb4f4d4460 100644
--- a/usr.sbin/yppoll/yppoll.c
+++ b/usr.sbin/yppoll/yppoll.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: yppoll.c,v 1.13 2013/04/02 02:50:49 deraadt Exp $ */
+/* $OpenBSD: yppoll.c,v 1.14 2013/04/16 19:24:55 deraadt Exp $ */
/* $NetBSD: yppoll.c,v 1.5 1996/05/13 02:46:36 thorpej Exp $ */
/*
@@ -168,7 +168,7 @@ main(int argc, char *argv[])
torder = order;
printf("Map %s has order number %lld. %s", inmap,
- (long long)order, ctime((time_t *)&torder));
+ (long long)order, ctime(&torder));
printf("The master server is %s.\n", master);
exit(0);
}