Use utc_offset() where applicable, and hide the internals of it

as static variables.

1 files changed, 3 insertions, 5 deletions

diff --git a/sys/fs/msdosfs/msdosfs_conv.c b/sys/fs/msdosfs/msdosfs_conv.c
index 21836f2..c9dee48 100644
--- a/sys/fs/msdosfs/msdosfs_conv.c
+++ b/sys/fs/msdosfs/msdosfs_conv.c
@@ -55,7 +55,7 @@
 #include <sys/clock.h>
 #include <sys/kernel.h>		/* defines tz */
 #include <sys/systm.h>
-#include <machine/clock.h>
+#include <sys/clock.h>
 #include <sys/dirent.h>
 #include <sys/iconv.h>
 #include <sys/mount.h>
@@ -127,8 +127,7 @@ unix2dostime(tsp, ddp, dtp, dhp)
 	 * If the time from the last conversion is the same as now, then
 	 * skip the computations and use the saved result.
 	 */
-	t = tsp->tv_sec - (tz_minuteswest * 60)
-	    - (wall_cmos_clock ? adjkerntz : 0);
+	t = tsp->tv_sec - utc_offset();
 	    /* - daylight savings time correction */
 	t &= ~1;
 	if (lasttime != t) {
@@ -239,8 +238,7 @@ dos2unixtime(dd, dt, dh, tsp)
 		days += ((dd & DD_DAY_MASK) >> DD_DAY_SHIFT) - 1;
 		lastseconds = (days * 24 * 60 * 60) + SECONDSTO1980;
 	}
-	tsp->tv_sec = seconds + lastseconds + (tz_minuteswest * 60)
-	     + adjkerntz;
+	tsp->tv_sec = seconds + lastseconds + utc_offset();
 	     /* + daylight savings time correction */
 	tsp->tv_nsec = (dh % 100) * 10000000;
 }