From 42676d758bb4e99e64200d0ae8fdf3e5a7edf717 Mon Sep 17 00:00:00 2001
From: Mark Kettenis <kettenis@cvs.openbsd.org>
Date: Sat, 8 Feb 2014 11:04:51 +0000
Subject: Initializing the time from an uninitialized variable isn't a very
 good idea. While there, afnsify the inittodr() prototype.

---
 sys/arch/sparc64/sparc64/clock.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'sys')

diff --git a/sys/arch/sparc64/sparc64/clock.c b/sys/arch/sparc64/sparc64/clock.c
index 18efa11bcad..87c15e03b70 100644
--- a/sys/arch/sparc64/sparc64/clock.c
+++ b/sys/arch/sparc64/sparc64/clock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: clock.c,v 1.50 2014/01/30 00:51:13 dlg Exp $	*/
+/*	$OpenBSD: clock.c,v 1.51 2014/02/08 11:04:50 kettenis Exp $	*/
 /*	$NetBSD: clock.c,v 1.41 2001/07/24 19:29:25 eeh Exp $ */
 
 /*
@@ -899,14 +899,15 @@ int sparc_clock_time_is_ok;
  * Set up the system's time, given a `reasonable' time value.
  */
 void
-inittodr(base)
-	time_t base;
+inittodr(time_t base)
 {
 	int badbase = 0, waszero = base == 0;
 	char *bad = NULL;
 	struct timeval tv;
 	struct timespec ts;
 
+	tv.tv_sec = tv.tv_usec = 0;
+
 	if (base < 5 * SECYR) {
 		/*
 		 * If base is 0, assume filesystem time is just unknown
@@ -919,8 +920,10 @@ inittodr(base)
 		badbase = 1;
 	}
 
-	if (todr_handle && (todr_gettime(todr_handle, &tv) != 0 ||
-	    tv.tv_sec == 0)) {
+	if (todr_handle != NULL)
+		todr_gettime(todr_handle, &tv);
+
+	if (tv.tv_sec == 0) {
 		/*
 		 * Believe the time in the file system for lack of
 		 * anything better, resetting the clock.
-- 
cgit v1.2.3