Merge "time: Improve C99 compliance"

2011-06-23 09:10:39 -07:00
parent ac56f5ca2f 21edf366ea
commit 2be3f09f2d
1 changed files with 7 additions and 4 deletions
--- a/libc/unistd/time.c
+++ b/libc/unistd/time.c
@@ -34,12 +34,15 @@ time_t
 time(time_t *t)
 {
 	struct timeval tt;
+	time_t ret;

 	if (gettimeofday(&tt, (struct timezone *)0) < 0)
-		return (-1);
-	if (t)
-		*t = (time_t)tt.tv_sec;
-	return (tt.tv_sec);
+		ret = -1;
+	else
+		ret = tt.tv_sec;
+	if (t != NULL)
+		*t = ret;
+	return ret;
 }