diff options
author | bde <bde@FreeBSD.org> | 1994-09-15 19:46:03 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 1994-09-15 19:46:03 +0000 |
commit | 1bfaf25b30ba76f2f7d7cec0cd52127fdf3b4ffb (patch) | |
tree | c3150fd7aa74cfe6417d8ec490b828977b8c1971 /sys/isofs/cd9660/cd9660_node.c | |
parent | 019579bbf98ca36993865b913cb8d08f468c4c54 (diff) | |
download | FreeBSD-src-1bfaf25b30ba76f2f7d7cec0cd52127fdf3b4ffb.zip FreeBSD-src-1bfaf25b30ba76f2f7d7cec0cd52127fdf3b4ffb.tar.gz |
Obtained from:
Remove the unnecessary inclusion of disklabel.h in cd9660_vfsops.c so
that I don't have to worry about the latter when changing disklabel.h.
Supply prototypes for some functions that were implicitly declared and
fix the resulting warnings and errors (timevals were punned to timespecs).
Diffstat (limited to 'sys/isofs/cd9660/cd9660_node.c')
-rw-r--r-- | sys/isofs/cd9660/cd9660_node.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/isofs/cd9660/cd9660_node.c b/sys/isofs/cd9660/cd9660_node.c index 43b1ffe..79ee4f4 100644 --- a/sys/isofs/cd9660/cd9660_node.c +++ b/sys/isofs/cd9660/cd9660_node.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)cd9660_node.c 8.2 (Berkeley) 1/23/94 - * $Id$ + * $Id: cd9660_node.c,v 1.3 1994/08/02 07:41:19 davidg Exp $ */ #include <sys/param.h> @@ -562,7 +562,7 @@ cd9660_deftstamp(isodir,inop,bp) int cd9660_tstamp_conv7(pi,pu) char *pi; -struct timeval *pu; +struct timespec *pu; { int i; int crtime, days; @@ -577,8 +577,8 @@ struct timeval *pu; tz = pi[6]; if (y < 1970) { - pu->tv_sec = 0; - pu->tv_usec = 0; + pu->ts_sec = 0; + pu->ts_nsec = 0; return 0; } else { #ifdef ORIGINAL @@ -598,8 +598,8 @@ struct timeval *pu; if (-48 <= tz && tz <= 52) crtime += tz * 15 * 60; } - pu->tv_sec = crtime; - pu->tv_usec = 0; + pu->ts_sec = crtime; + pu->ts_nsec = 0; return 1; } @@ -620,7 +620,7 @@ cd9660_chars2ui(begin,len) int cd9660_tstamp_conv17(pi,pu) unsigned char *pi; - struct timeval *pu; + struct timespec *pu; { unsigned char buf[7]; |