aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNate Williams <nate@FreeBSD.org>1996-09-20 04:33:57 +0000
committerNate Williams <nate@FreeBSD.org>1996-09-20 04:33:57 +0000
commitb70db4c5d53adb2a12328f02792a2be5ed971a98 (patch)
tree6db64fc548b4ef41c2a5e12c31d2c0ae76f316c9
parent2936258f1dd4448884efb4b544dd322498de20b9 (diff)
downloadsrc-b70db4c5d53adb2a12328f02792a2be5ed971a98.tar.gz
src-b70db4c5d53adb2a12328f02792a2be5ed971a98.zip
ts_sec -> tv_sec
ts_nsec -> tv_nsec
Notes
Notes: svn path=/head/; revision=18406
-rw-r--r--sbin/fsdb/fsdb.c4
-rw-r--r--sbin/fsdb/fsdbutil.c12
-rw-r--r--sbin/restore/dirs.c8
-rw-r--r--sbin/restore/tape.c14
4 files changed, 19 insertions, 19 deletions
diff --git a/sbin/fsdb/fsdb.c b/sbin/fsdb/fsdb.c
index 8a7bb7a73175..5d263aa5d09f 100644
--- a/sbin/fsdb/fsdb.c
+++ b/sbin/fsdb/fsdb.c
@@ -832,8 +832,8 @@ badformat:
warnx("date/time out of range");
return 1;
}
- rts->ts_sec = sec;
- rts->ts_nsec = nsec;
+ rts->tv_sec = sec;
+ rts->tv_nsec = nsec;
return 0;
}
diff --git a/sbin/fsdb/fsdbutil.c b/sbin/fsdb/fsdbutil.c
index 262bc1a66d3d..2ea7d6c02f66 100644
--- a/sbin/fsdb/fsdbutil.c
+++ b/sbin/fsdb/fsdbutil.c
@@ -130,15 +130,15 @@ printstat(cp, inum, dp)
break;
}
printf("I=%lu MODE=%o SIZE=%qu", inum, dp->di_mode, dp->di_size);
- p = ctime(&dp->di_mtime.ts_sec);
+ p = ctime(&dp->di_mtime.tv_sec);
printf("\n\tMTIME=%15.15s %4.4s [%d nsec]", &p[4], &p[20],
- dp->di_mtime.ts_nsec);
- p = ctime(&dp->di_ctime.ts_sec);
+ dp->di_mtime.tv_nsec);
+ p = ctime(&dp->di_ctime.tv_sec);
printf("\n\tCTIME=%15.15s %4.4s [%d nsec]", &p[4], &p[20],
- dp->di_ctime.ts_nsec);
- p = ctime(&dp->di_atime.ts_sec);
+ dp->di_ctime.tv_nsec);
+ p = ctime(&dp->di_atime.tv_sec);
printf("\n\tATIME=%15.15s %4.4s [%d nsec]\n", &p[4], &p[20],
- dp->di_atime.ts_nsec);
+ dp->di_atime.tv_nsec);
if (pw = getpwuid(dp->di_uid))
printf("OWNER=%s ", pw->pw_name);
diff --git a/sbin/restore/dirs.c b/sbin/restore/dirs.c
index c5d025dd398e..b092eab361fc 100644
--- a/sbin/restore/dirs.c
+++ b/sbin/restore/dirs.c
@@ -708,10 +708,10 @@ allocinotab(ino, dip, seekpt)
if (mf == NULL)
return (itp);
node.ino = ino;
- node.timep[0].tv_sec = dip->di_atime.ts_sec;
- node.timep[0].tv_usec = dip->di_atime.ts_nsec / 1000;
- node.timep[1].tv_sec = dip->di_mtime.ts_sec;
- node.timep[1].tv_usec = dip->di_mtime.ts_nsec / 1000;
+ node.timep[0].tv_sec = dip->di_atime.tv_sec;
+ node.timep[0].tv_usec = dip->di_atime.tv_nsec / 1000;
+ node.timep[1].tv_sec = dip->di_mtime.tv_sec;
+ node.timep[1].tv_usec = dip->di_mtime.tv_nsec / 1000;
node.mode = dip->di_mode;
node.uid = dip->di_uid;
node.gid = dip->di_gid;
diff --git a/sbin/restore/tape.c b/sbin/restore/tape.c
index ebfa55595293..fcf41e85ea2c 100644
--- a/sbin/restore/tape.c
+++ b/sbin/restore/tape.c
@@ -506,10 +506,10 @@ extractfile(name)
curfile.name = name;
curfile.action = USING;
- timep[0].tv_sec = curfile.dip->di_atime.ts_sec;
- timep[0].tv_usec = curfile.dip->di_atime.ts_nsec / 1000;
- timep[1].tv_sec = curfile.dip->di_mtime.ts_sec;
- timep[1].tv_usec = curfile.dip->di_mtime.ts_nsec / 1000;
+ timep[0].tv_sec = curfile.dip->di_atime.tv_sec;
+ timep[0].tv_usec = curfile.dip->di_atime.tv_nsec / 1000;
+ timep[1].tv_sec = curfile.dip->di_mtime.tv_sec;
+ timep[1].tv_usec = curfile.dip->di_mtime.tv_nsec / 1000;
mode = curfile.dip->di_mode;
switch (mode & IFMT) {
@@ -1037,9 +1037,9 @@ gethead(buf)
buf->c_dinode.di_gid = u_ospcl.s_ospcl.c_dinode.odi_gid;
buf->c_dinode.di_size = u_ospcl.s_ospcl.c_dinode.odi_size;
buf->c_dinode.di_rdev = u_ospcl.s_ospcl.c_dinode.odi_rdev;
- buf->c_dinode.di_atime.ts_sec = u_ospcl.s_ospcl.c_dinode.odi_atime;
- buf->c_dinode.di_mtime.ts_sec = u_ospcl.s_ospcl.c_dinode.odi_mtime;
- buf->c_dinode.di_ctime.ts_sec = u_ospcl.s_ospcl.c_dinode.odi_ctime;
+ buf->c_dinode.di_atime.tv_sec = u_ospcl.s_ospcl.c_dinode.odi_atime;
+ buf->c_dinode.di_mtime.tv_sec = u_ospcl.s_ospcl.c_dinode.odi_mtime;
+ buf->c_dinode.di_ctime.tv_sec = u_ospcl.s_ospcl.c_dinode.odi_ctime;
buf->c_count = u_ospcl.s_ospcl.c_count;
bcopy(u_ospcl.s_ospcl.c_addr, buf->c_addr, (long)256);
if (u_ospcl.s_ospcl.c_magic != OFS_MAGIC ||