mirror of
https://github.com/freebsd/freebsd-src
synced 2024-09-21 09:13:37 +00:00
Whoops, I should've used the LINT config file. More ts -> tv changes
for timespec structure.
This commit is contained in:
Nate Williams
parent
f031d834e1
commit
95a1574e4f
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=18412
|
|
@ -36,7 +36,7 @@
|
|||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)cd9660_node.c 8.2 (Berkeley) 1/23/94
|
||||
* $Id: cd9660_node.c,v 1.12 1995/12/03 17:14:33 bde Exp $
|
||||
* $Id: cd9660_node.c,v 1.13 1996/06/12 03:36:23 davidg Exp $
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
|
|
@ -583,8 +583,8 @@ enum ISO_FTYPE ftype;
|
|||
tz = 0;
|
||||
|
||||
if (y < 1970) {
|
||||
pu->ts_sec = 0;
|
||||
pu->ts_nsec = 0;
|
||||
pu->tv_sec = 0;
|
||||
pu->tv_nsec = 0;
|
||||
return 0;
|
||||
} else {
|
||||
#ifdef ORIGINAL
|
||||
|
|
@ -604,8 +604,8 @@ enum ISO_FTYPE ftype;
|
|||
if (-48 <= tz && tz <= 52)
|
||||
crtime -= tz * 15 * 60;
|
||||
}
|
||||
pu->ts_sec = crtime;
|
||||
pu->ts_nsec = 0;
|
||||
pu->tv_sec = crtime;
|
||||
pu->tv_nsec = 0;
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)cd9660_vnops.c 8.3 (Berkeley) 1/23/94
|
||||
* $Id: cd9660_vnops.c,v 1.24 1996/03/14 21:44:32 joerg Exp $
|
||||
* $Id: cd9660_vnops.c,v 1.25 1996/05/02 10:43:14 phk Exp $
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
|
|
@ -158,8 +158,8 @@ cd9660_setattr(ap)
|
|||
struct vattr *vap = ap->a_vap;
|
||||
|
||||
if (vap->va_flags != VNOVAL || vap->va_uid != (uid_t)VNOVAL ||
|
||||
vap->va_gid != (gid_t)VNOVAL || vap->va_atime.ts_sec != VNOVAL ||
|
||||
vap->va_mtime.ts_sec != VNOVAL || vap->va_mode != (mode_t)VNOVAL)
|
||||
vap->va_gid != (gid_t)VNOVAL || vap->va_atime.tv_sec != VNOVAL ||
|
||||
vap->va_mtime.tv_sec != VNOVAL || vap->va_mode != (mode_t)VNOVAL)
|
||||
return (EROFS);
|
||||
if (vap->va_size != VNOVAL) {
|
||||
switch (vp->v_type) {
|
||||
|
|
|
|||
|
|
@ -118,16 +118,16 @@ ext2_update(ap)
|
|||
(IN_ACCESS | IN_CHANGE | IN_MODIFIED | IN_UPDATE)) == 0)
|
||||
return (0);
|
||||
if (ip->i_flag & IN_ACCESS)
|
||||
ip->i_atime.ts_sec = ap->a_access->tv_sec;
|
||||
ip->i_atime.tv_sec = ap->a_access->tv_sec;
|
||||
if (ip->i_flag & IN_UPDATE) {
|
||||
ip->i_mtime.ts_sec = ap->a_modify->tv_sec;
|
||||
ip->i_mtime.tv_sec = ap->a_modify->tv_sec;
|
||||
ip->i_modrev++;
|
||||
}
|
||||
if (ip->i_flag & IN_CHANGE) {
|
||||
#if !defined(__FreeBSD__)
|
||||
get_time(&time);
|
||||
#endif
|
||||
ip->i_ctime.ts_sec = time.tv_sec;
|
||||
ip->i_ctime.tv_sec = time.tv_sec;
|
||||
}
|
||||
ip->i_flag &= ~(IN_ACCESS | IN_CHANGE | IN_MODIFIED | IN_UPDATE);
|
||||
fs = ip->i_e2fs;
|
||||
|
|
|
|||
|
|
@ -66,17 +66,17 @@ ext2_print_dinode( di )
|
|||
di->di_uid, di->di_gid, di->di_size);
|
||||
printf( "Links: %3d Blockcount: %d\n",
|
||||
di->di_nlink, di->di_blocks);
|
||||
printf( "ctime: 0x%x", di->di_ctime.ts_sec);
|
||||
printf( "ctime: 0x%x", di->di_ctime.tv_sec);
|
||||
#if !defined(__FreeBSD__)
|
||||
print_time(" -- %s\n", di->di_ctime.ts_sec);
|
||||
print_time(" -- %s\n", di->di_ctime.tv_sec);
|
||||
#endif
|
||||
printf( "atime: 0x%x", di->di_atime.ts_sec);
|
||||
printf( "atime: 0x%x", di->di_atime.tv_sec);
|
||||
#if !defined(__FreeBSD__)
|
||||
print_time(" -- %s\n", di->di_atime.ts_sec);
|
||||
print_time(" -- %s\n", di->di_atime.tv_sec);
|
||||
#endif
|
||||
printf( "mtime: 0x%x", di->di_mtime.ts_sec);
|
||||
printf( "mtime: 0x%x", di->di_mtime.tv_sec);
|
||||
#if !defined(__FreeBSD__)
|
||||
print_time(" -- %s\n", di->di_mtime.ts_sec);
|
||||
print_time(" -- %s\n", di->di_mtime.tv_sec);
|
||||
#endif
|
||||
printf( "BLOCKS: ");
|
||||
for(i=0; i < (di->di_blocks <= 24 ? ((di->di_blocks+1)/2): 12); i++)
|
||||
|
|
@ -110,9 +110,9 @@ ext2_ei2di(ei, di)
|
|||
*/
|
||||
di->di_mode = ei->i_links_count ? ei->i_mode : 0;
|
||||
di->di_size = ei->i_size;
|
||||
di->di_atime.ts_sec = ei->i_atime;
|
||||
di->di_mtime.ts_sec = ei->i_mtime;
|
||||
di->di_ctime.ts_sec = ei->i_ctime;
|
||||
di->di_atime.tv_sec = ei->i_atime;
|
||||
di->di_mtime.tv_sec = ei->i_mtime;
|
||||
di->di_ctime.tv_sec = ei->i_ctime;
|
||||
di->di_flags = 0;
|
||||
di->di_flags |= (ei->i_flags & EXT2_APPEND_FL) ? APPEND : 0;
|
||||
di->di_flags |= (ei->i_flags & EXT2_IMMUTABLE_FL) ? IMMUTABLE : 0;
|
||||
|
|
@ -143,11 +143,11 @@ ext2_di2ei(di, ei)
|
|||
Godmar thinks: if dtime is nonzero, ext2 says this inode
|
||||
has been deleted, this would correspond to a zero link count
|
||||
*/
|
||||
ei->i_dtime = ei->i_links_count ? 0 : di->di_mtime.ts_sec;
|
||||
ei->i_dtime = ei->i_links_count ? 0 : di->di_mtime.tv_sec;
|
||||
ei->i_size = di->di_size;
|
||||
ei->i_atime = di->di_atime.ts_sec;
|
||||
ei->i_mtime = di->di_mtime.ts_sec;
|
||||
ei->i_ctime = di->di_ctime.ts_sec;
|
||||
ei->i_atime = di->di_atime.tv_sec;
|
||||
ei->i_mtime = di->di_mtime.tv_sec;
|
||||
ei->i_ctime = di->di_ctime.tv_sec;
|
||||
ei->i_flags = di->di_flags;
|
||||
ei->i_flags = 0;
|
||||
ei->i_flags |= (di->di_flags & APPEND) ? EXT2_APPEND_FL: 0;
|
||||
|
|
|
|||
|
|
@ -118,16 +118,16 @@ ext2_update(ap)
|
|||
(IN_ACCESS | IN_CHANGE | IN_MODIFIED | IN_UPDATE)) == 0)
|
||||
return (0);
|
||||
if (ip->i_flag & IN_ACCESS)
|
||||
ip->i_atime.ts_sec = ap->a_access->tv_sec;
|
||||
ip->i_atime.tv_sec = ap->a_access->tv_sec;
|
||||
if (ip->i_flag & IN_UPDATE) {
|
||||
ip->i_mtime.ts_sec = ap->a_modify->tv_sec;
|
||||
ip->i_mtime.tv_sec = ap->a_modify->tv_sec;
|
||||
ip->i_modrev++;
|
||||
}
|
||||
if (ip->i_flag & IN_CHANGE) {
|
||||
#if !defined(__FreeBSD__)
|
||||
get_time(&time);
|
||||
#endif
|
||||
ip->i_ctime.ts_sec = time.tv_sec;
|
||||
ip->i_ctime.tv_sec = time.tv_sec;
|
||||
}
|
||||
ip->i_flag &= ~(IN_ACCESS | IN_CHANGE | IN_MODIFIED | IN_UPDATE);
|
||||
fs = ip->i_e2fs;
|
||||
|
|
|
|||
|
|
@ -66,17 +66,17 @@ ext2_print_dinode( di )
|
|||
di->di_uid, di->di_gid, di->di_size);
|
||||
printf( "Links: %3d Blockcount: %d\n",
|
||||
di->di_nlink, di->di_blocks);
|
||||
printf( "ctime: 0x%x", di->di_ctime.ts_sec);
|
||||
printf( "ctime: 0x%x", di->di_ctime.tv_sec);
|
||||
#if !defined(__FreeBSD__)
|
||||
print_time(" -- %s\n", di->di_ctime.ts_sec);
|
||||
print_time(" -- %s\n", di->di_ctime.tv_sec);
|
||||
#endif
|
||||
printf( "atime: 0x%x", di->di_atime.ts_sec);
|
||||
printf( "atime: 0x%x", di->di_atime.tv_sec);
|
||||
#if !defined(__FreeBSD__)
|
||||
print_time(" -- %s\n", di->di_atime.ts_sec);
|
||||
print_time(" -- %s\n", di->di_atime.tv_sec);
|
||||
#endif
|
||||
printf( "mtime: 0x%x", di->di_mtime.ts_sec);
|
||||
printf( "mtime: 0x%x", di->di_mtime.tv_sec);
|
||||
#if !defined(__FreeBSD__)
|
||||
print_time(" -- %s\n", di->di_mtime.ts_sec);
|
||||
print_time(" -- %s\n", di->di_mtime.tv_sec);
|
||||
#endif
|
||||
printf( "BLOCKS: ");
|
||||
for(i=0; i < (di->di_blocks <= 24 ? ((di->di_blocks+1)/2): 12); i++)
|
||||
|
|
@ -110,9 +110,9 @@ ext2_ei2di(ei, di)
|
|||
*/
|
||||
di->di_mode = ei->i_links_count ? ei->i_mode : 0;
|
||||
di->di_size = ei->i_size;
|
||||
di->di_atime.ts_sec = ei->i_atime;
|
||||
di->di_mtime.ts_sec = ei->i_mtime;
|
||||
di->di_ctime.ts_sec = ei->i_ctime;
|
||||
di->di_atime.tv_sec = ei->i_atime;
|
||||
di->di_mtime.tv_sec = ei->i_mtime;
|
||||
di->di_ctime.tv_sec = ei->i_ctime;
|
||||
di->di_flags = 0;
|
||||
di->di_flags |= (ei->i_flags & EXT2_APPEND_FL) ? APPEND : 0;
|
||||
di->di_flags |= (ei->i_flags & EXT2_IMMUTABLE_FL) ? IMMUTABLE : 0;
|
||||
|
|
@ -143,11 +143,11 @@ ext2_di2ei(di, ei)
|
|||
Godmar thinks: if dtime is nonzero, ext2 says this inode
|
||||
has been deleted, this would correspond to a zero link count
|
||||
*/
|
||||
ei->i_dtime = ei->i_links_count ? 0 : di->di_mtime.ts_sec;
|
||||
ei->i_dtime = ei->i_links_count ? 0 : di->di_mtime.tv_sec;
|
||||
ei->i_size = di->di_size;
|
||||
ei->i_atime = di->di_atime.ts_sec;
|
||||
ei->i_mtime = di->di_mtime.ts_sec;
|
||||
ei->i_ctime = di->di_ctime.ts_sec;
|
||||
ei->i_atime = di->di_atime.tv_sec;
|
||||
ei->i_mtime = di->di_mtime.tv_sec;
|
||||
ei->i_ctime = di->di_ctime.tv_sec;
|
||||
ei->i_flags = di->di_flags;
|
||||
ei->i_flags = 0;
|
||||
ei->i_flags |= (di->di_flags & APPEND) ? EXT2_APPEND_FL: 0;
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)cd9660_node.c 8.2 (Berkeley) 1/23/94
|
||||
* $Id: cd9660_node.c,v 1.12 1995/12/03 17:14:33 bde Exp $
|
||||
* $Id: cd9660_node.c,v 1.13 1996/06/12 03:36:23 davidg Exp $
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
|
|
@ -583,8 +583,8 @@ enum ISO_FTYPE ftype;
|
|||
tz = 0;
|
||||
|
||||
if (y < 1970) {
|
||||
pu->ts_sec = 0;
|
||||
pu->ts_nsec = 0;
|
||||
pu->tv_sec = 0;
|
||||
pu->tv_nsec = 0;
|
||||
return 0;
|
||||
} else {
|
||||
#ifdef ORIGINAL
|
||||
|
|
@ -604,8 +604,8 @@ enum ISO_FTYPE ftype;
|
|||
if (-48 <= tz && tz <= 52)
|
||||
crtime -= tz * 15 * 60;
|
||||
}
|
||||
pu->ts_sec = crtime;
|
||||
pu->ts_nsec = 0;
|
||||
pu->tv_sec = crtime;
|
||||
pu->tv_nsec = 0;
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)cd9660_vnops.c 8.3 (Berkeley) 1/23/94
|
||||
* $Id: cd9660_vnops.c,v 1.24 1996/03/14 21:44:32 joerg Exp $
|
||||
* $Id: cd9660_vnops.c,v 1.25 1996/05/02 10:43:14 phk Exp $
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
|
|
@ -158,8 +158,8 @@ cd9660_setattr(ap)
|
|||
struct vattr *vap = ap->a_vap;
|
||||
|
||||
if (vap->va_flags != VNOVAL || vap->va_uid != (uid_t)VNOVAL ||
|
||||
vap->va_gid != (gid_t)VNOVAL || vap->va_atime.ts_sec != VNOVAL ||
|
||||
vap->va_mtime.ts_sec != VNOVAL || vap->va_mode != (mode_t)VNOVAL)
|
||||
vap->va_gid != (gid_t)VNOVAL || vap->va_atime.tv_sec != VNOVAL ||
|
||||
vap->va_mtime.tv_sec != VNOVAL || vap->va_mode != (mode_t)VNOVAL)
|
||||
return (EROFS);
|
||||
if (vap->va_size != VNOVAL) {
|
||||
switch (vp->v_type) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue