From 10e1c2d28a8fa207be3aa31b7a5b0bbb7034a20b Mon Sep 17 00:00:00 2001 From: Peter Wemm Date: Tue, 18 Mar 1997 20:02:18 +0000 Subject: [PATCH] patch up some "int *" vs. "time_t *" (long) mismatches. They could be nasty if sizeof(int) != sizeof(long). --- sbin/fsck/inode.c | 6 ++++-- sbin/fsck_ffs/inode.c | 6 ++++-- sbin/fsck_ifs/inode.c | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/sbin/fsck/inode.c b/sbin/fsck/inode.c index c4217544865b..c16571c1636f 100644 --- a/sbin/fsck/inode.c +++ b/sbin/fsck/inode.c @@ -500,6 +500,7 @@ pinode(ino) register struct dinode *dp; register char *p; struct passwd *pw; + time_t t; printf(" I=%lu ", ino); if (ino < ROOTINO || ino > maxino) @@ -514,7 +515,8 @@ pinode(ino) if (preen) printf("%s: ", cdevname); printf("SIZE=%qu ", dp->di_size); - p = ctime(&dp->di_mtime); + t = dp->di_mtime; + p = ctime(&t); printf("MTIME=%12.12s %4.4s ", &p[4], &p[20]); } @@ -585,7 +587,7 @@ allocino(request, type) return (0); } dp->di_mode = type; - (void)time(&dp->di_atime); + dp->di_atime = time(NULL); dp->di_mtime = dp->di_ctime = dp->di_atime; dp->di_size = sblock.fs_fsize; dp->di_blocks = btodb(sblock.fs_fsize); diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c index c4217544865b..c16571c1636f 100644 --- a/sbin/fsck_ffs/inode.c +++ b/sbin/fsck_ffs/inode.c @@ -500,6 +500,7 @@ pinode(ino) register struct dinode *dp; register char *p; struct passwd *pw; + time_t t; printf(" I=%lu ", ino); if (ino < ROOTINO || ino > maxino) @@ -514,7 +515,8 @@ pinode(ino) if (preen) printf("%s: ", cdevname); printf("SIZE=%qu ", dp->di_size); - p = ctime(&dp->di_mtime); + t = dp->di_mtime; + p = ctime(&t); printf("MTIME=%12.12s %4.4s ", &p[4], &p[20]); } @@ -585,7 +587,7 @@ allocino(request, type) return (0); } dp->di_mode = type; - (void)time(&dp->di_atime); + dp->di_atime = time(NULL); dp->di_mtime = dp->di_ctime = dp->di_atime; dp->di_size = sblock.fs_fsize; dp->di_blocks = btodb(sblock.fs_fsize); diff --git a/sbin/fsck_ifs/inode.c b/sbin/fsck_ifs/inode.c index c4217544865b..c16571c1636f 100644 --- a/sbin/fsck_ifs/inode.c +++ b/sbin/fsck_ifs/inode.c @@ -500,6 +500,7 @@ pinode(ino) register struct dinode *dp; register char *p; struct passwd *pw; + time_t t; printf(" I=%lu ", ino); if (ino < ROOTINO || ino > maxino) @@ -514,7 +515,8 @@ pinode(ino) if (preen) printf("%s: ", cdevname); printf("SIZE=%qu ", dp->di_size); - p = ctime(&dp->di_mtime); + t = dp->di_mtime; + p = ctime(&t); printf("MTIME=%12.12s %4.4s ", &p[4], &p[20]); } @@ -585,7 +587,7 @@ allocino(request, type) return (0); } dp->di_mode = type; - (void)time(&dp->di_atime); + dp->di_atime = time(NULL); dp->di_mtime = dp->di_ctime = dp->di_atime; dp->di_size = sblock.fs_fsize; dp->di_blocks = btodb(sblock.fs_fsize);