Module Name: src
Committed By: martin
Date: Sun Aug 31 08:54:40 UTC 2014
Modified Files:
src/sys/dev: clock_subr.c
Log Message:
Make this compile- and usable from userland as well.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/clock_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/clock_subr.c
diff -u src/sys/dev/clock_subr.c:1.16 src/sys/dev/clock_subr.c:1.17
--- src/sys/dev/clock_subr.c:1.16 Tue Feb 8 20:20:26 2011
+++ src/sys/dev/clock_subr.c Sun Aug 31 08:54:40 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: clock_subr.c,v 1.16 2011/02/08 20:20:26 rmind Exp $ */
+/* $NetBSD: clock_subr.c,v 1.17 2014/08/31 08:54:40 martin Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -44,11 +44,16 @@
* Derived from arch/hp300/hp300/clock.c
*/
+#ifdef _KERNEL
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock_subr.c,v 1.16 2011/02/08 20:20:26 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock_subr.c,v 1.17 2014/08/31 08:54:40 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
+#else
+#include <string.h>
+#include <time.h>
+#endif
#include <dev/clock_subr.h>
@@ -116,7 +121,7 @@ clock_ymdhms_to_secs(struct clock_ymdhms
* 60 + dt->dt_min)
* 60 + dt->dt_sec;
- if ((time_t)secs != secs)
+ if ((time_t)secs < 0 || secs > __type_max(time_t))
return -1;
return secs;
}
