From c2deb6082eeeddc89f91611a4e00e43a8ccc57c5 Mon Sep 17 00:00:00 2001 From: Bruce Evans Date: Mon, 29 Jun 1998 17:54:29 +0000 Subject: [PATCH] Don't assume that time_t is long. --- sbin/sysctl/sysctl.c | 6 ++++-- usr.sbin/sysctl/sysctl.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c index 47c82bf10015..8933b0f3fe00 100644 --- a/sbin/sysctl/sysctl.c +++ b/sbin/sysctl/sysctl.c @@ -42,7 +42,7 @@ static const char copyright[] = static char sccsid[] = "@(#)from: sysctl.c 8.1 (Berkeley) 6/6/93"; #endif static const char rcsid[] = - "$Id: sysctl.c,v 1.15 1997/10/20 12:53:54 charnier Exp $"; + "$Id: sysctl.c,v 1.16 1997/11/18 03:37:45 jdp Exp $"; #endif /* not lint */ #include @@ -245,13 +245,15 @@ static int S_timeval(int l2, void *p) { struct timeval *tv = (struct timeval*)p; + time_t tv_sec; char *p1, *p2; if (l2 != sizeof *tv) err(1, "S_timeval %d != %d", l2, sizeof *tv); printf("{ sec = %ld, usec = %ld } ", tv->tv_sec, tv->tv_usec); - p1 = strdup(ctime(&tv->tv_sec)); + tv_sec = tv->tv_sec; + p1 = strdup(ctime(&tv_sec)); for (p2=p1; *p2 ; p2++) if (*p2 == '\n') *p2 = '\0'; diff --git a/usr.sbin/sysctl/sysctl.c b/usr.sbin/sysctl/sysctl.c index 47c82bf10015..8933b0f3fe00 100644 --- a/usr.sbin/sysctl/sysctl.c +++ b/usr.sbin/sysctl/sysctl.c @@ -42,7 +42,7 @@ static const char copyright[] = static char sccsid[] = "@(#)from: sysctl.c 8.1 (Berkeley) 6/6/93"; #endif static const char rcsid[] = - "$Id: sysctl.c,v 1.15 1997/10/20 12:53:54 charnier Exp $"; + "$Id: sysctl.c,v 1.16 1997/11/18 03:37:45 jdp Exp $"; #endif /* not lint */ #include @@ -245,13 +245,15 @@ static int S_timeval(int l2, void *p) { struct timeval *tv = (struct timeval*)p; + time_t tv_sec; char *p1, *p2; if (l2 != sizeof *tv) err(1, "S_timeval %d != %d", l2, sizeof *tv); printf("{ sec = %ld, usec = %ld } ", tv->tv_sec, tv->tv_usec); - p1 = strdup(ctime(&tv->tv_sec)); + tv_sec = tv->tv_sec; + p1 = strdup(ctime(&tv_sec)); for (p2=p1; *p2 ; p2++) if (*p2 == '\n') *p2 = '\0';