Minix/minix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removing VFS_UTIMENS_* field macros.

Browse Source 
Change-Id: I3be1acfbb77b6e229d784d8dbc3ceec1b26abf90
This commit is contained in:
sambuc
2014-03-03 20:47:00 +01:00
parent 94c9376df5
commit b33edbfe7a
8 changed files with 66 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/libc/sys-minix/futimens.c
+7 -8
View File
@@ -13,14 +13,13 @@ int futimens(int fd, const struct timespec tv[2])
if (tv == NULL) tv = now;
memset(&m, 0, sizeof(m));
m.VFS_UTIMENS_FD = fd;
/* For now just truncate to 32bit time_t values. */
m.VFS_UTIMENS_ATIME = (int32_t)tv[0].tv_sec;
m.VFS_UTIMENS_MTIME = (int32_t)tv[1].tv_sec;
m.VFS_UTIMENS_ANSEC = (int32_t)tv[0].tv_nsec;
m.VFS_UTIMENS_MNSEC = (int32_t)tv[1].tv_nsec;
m.VFS_UTIMENS_NAME = NULL;
m.VFS_UTIMENS_FLAGS = 0;
m.m_vfs_utimens.fd = fd;
m.m_vfs_utimens.atime = tv[0].tv_sec;
m.m_vfs_utimens.mtime = tv[1].tv_sec;
m.m_vfs_utimens.ansec = tv[0].tv_nsec;
m.m_vfs_utimens.mnsec = tv[1].tv_nsec;
m.m_vfs_utimens.name = NULL;
m.m_vfs_utimens.flags = 0;
return(_syscall(VFS_PROC_NR, VFS_UTIMENS, &m));
}
lib/libc/sys-minix/futimes.c
+9 -9
View File
@@ -15,19 +15,19 @@ int futimes(int fd, const struct timeval tv[2])
message m;
memset(&m, 0, sizeof(m));
m.VFS_UTIMENS_FD = fd;
m.m_vfs_utimens.fd = fd;
if (tv == NULL) {
m.VFS_UTIMENS_ATIME = m.VFS_UTIMENS_MTIME = 0;
m.VFS_UTIMENS_ANSEC = m.VFS_UTIMENS_MNSEC = UTIME_NOW;
m.m_vfs_utimens.atime = m.m_vfs_utimens.mtime = 0;
m.m_vfs_utimens.ansec = m.m_vfs_utimens.mnsec = UTIME_NOW;
}
else {
m.VFS_UTIMENS_ATIME = (int32_t)tv[0].tv_sec;
m.VFS_UTIMENS_MTIME = (int32_t)tv[1].tv_sec;
m.VFS_UTIMENS_ANSEC = (int32_t)tv[0].tv_usec * 1000;
m.VFS_UTIMENS_MNSEC = (int32_t)tv[1].tv_usec * 1000;
m.m_vfs_utimens.atime = tv[0].tv_sec;
m.m_vfs_utimens.mtime = tv[1].tv_sec;
m.m_vfs_utimens.ansec = tv[0].tv_usec * 1000;
m.m_vfs_utimens.mnsec = tv[1].tv_usec * 1000;
}
m.VFS_UTIMENS_NAME = NULL;
m.VFS_UTIMENS_FLAGS = 0;
m.m_vfs_utimens.name = NULL;
m.m_vfs_utimens.flags = 0;
return(_syscall(VFS_PROC_NR, VFS_UTIMENS, &m));
}
lib/libc/sys-minix/lutimes.c
+9 -10
View File
@@ -25,20 +25,19 @@ int lutimes(const char *name, const struct timeval tv[2])
return -1;
}
memset(&m, 0, sizeof(m));
m.VFS_UTIMENS_FD = strlen(name) + 1;
m.VFS_UTIMENS_NAME = (char *) __UNCONST(name);
m.m_vfs_utimens.len = strlen(name) + 1;
m.m_vfs_utimens.name = (char *) __UNCONST(name);
if (tv == NULL) {
m.VFS_UTIMENS_ATIME = m.VFS_UTIMENS_MTIME = 0;
m.VFS_UTIMENS_ANSEC = m.VFS_UTIMENS_MNSEC = UTIME_NOW;
m.m_vfs_utimens.atime = m.m_vfs_utimens.mtime = 0;
m.m_vfs_utimens.ansec = m.m_vfs_utimens.mnsec = UTIME_NOW;
}
else {
/* For now just truncate time_t values to 32bits. */
m.VFS_UTIMENS_ATIME = (int32_t)tv[0].tv_sec;
m.VFS_UTIMENS_MTIME = (int32_t)tv[1].tv_sec;
m.VFS_UTIMENS_ANSEC = (int32_t)tv[0].tv_usec * 1000;
m.VFS_UTIMENS_MNSEC = (int32_t)tv[1].tv_usec * 1000;
m.m_vfs_utimens.atime = tv[0].tv_sec;
m.m_vfs_utimens.mtime = tv[1].tv_sec;
m.m_vfs_utimens.ansec = tv[0].tv_usec * 1000;
m.m_vfs_utimens.mnsec = tv[1].tv_usec * 1000;
}
m.VFS_UTIMENS_FLAGS = AT_SYMLINK_NOFOLLOW;
m.m_vfs_utimens.flags = AT_SYMLINK_NOFOLLOW;
return(_syscall(VFS_PROC_NR, VFS_UTIMENS, &m));
}
lib/libc/sys-minix/utimensat.c
+7 -8
View File
@@ -44,14 +44,13 @@ int utimensat(int fd, const char *name, const struct timespec tv[2],
}
memset(&m, 0, sizeof(m));
m.VFS_UTIMENS_LEN = strlen(name) + 1;
m.VFS_UTIMENS_NAME = (char *) __UNCONST(name);
/* For now just truncate time_t values to 32bits. */
m.VFS_UTIMENS_ATIME = (int32_t)tv[0].tv_sec;
m.VFS_UTIMENS_MTIME = (int32_t)tv[1].tv_sec;
m.VFS_UTIMENS_ANSEC = (int32_t)tv[0].tv_nsec;
m.VFS_UTIMENS_MNSEC = (int32_t)tv[1].tv_nsec;
m.VFS_UTIMENS_FLAGS = flags;
m.m_vfs_utimens.len = strlen(name) + 1;
m.m_vfs_utimens.name = __UNCONST(name);
m.m_vfs_utimens.atime = tv[0].tv_sec;
m.m_vfs_utimens.mtime = tv[1].tv_sec;
m.m_vfs_utimens.ansec = tv[0].tv_nsec;
m.m_vfs_utimens.mnsec = tv[1].tv_nsec;
m.m_vfs_utimens.flags = flags;
return(_syscall(VFS_PROC_NR, VFS_UTIMENS, &m));
}
lib/libc/sys-minix/utimes.c
+9 -10
View File
@@ -24,20 +24,19 @@ int utimes(const char *name, const struct timeval tv[2])
return -1;
}
memset(&m, 0, sizeof(m));
m.VFS_UTIMENS_LEN = strlen(name) + 1;
m.VFS_UTIMENS_NAME = (char *) __UNCONST(name);
m.m_vfs_utimens.len = strlen(name) + 1;
m.m_vfs_utimens.name = __UNCONST(name);
if (tv == NULL) {
m.VFS_UTIMENS_ATIME = m.VFS_UTIMENS_MTIME = 0;
m.VFS_UTIMENS_ANSEC = m.VFS_UTIMENS_MNSEC = UTIME_NOW;
m.m_vfs_utimens.atime = m.m_vfs_utimens.mtime = 0;
m.m_vfs_utimens.ansec = m.m_vfs_utimens.mnsec = UTIME_NOW;
}
else {
/* For now just truncate time_t values to 32bits. */
m.VFS_UTIMENS_ATIME = (int32_t)tv[0].tv_sec;
m.VFS_UTIMENS_MTIME = (int32_t)tv[1].tv_sec;
m.VFS_UTIMENS_ANSEC = (int32_t)tv[0].tv_usec * 1000;
m.VFS_UTIMENS_MNSEC = (int32_t)tv[1].tv_usec * 1000;
m.m_vfs_utimens.atime = tv[0].tv_sec;
m.m_vfs_utimens.mtime = tv[1].tv_sec;
m.m_vfs_utimens.ansec = tv[0].tv_usec * 1000;
m.m_vfs_utimens.mnsec = tv[1].tv_usec * 1000;
}
m.VFS_UTIMENS_FLAGS = 0;
m.m_vfs_utimens.flags = 0;
return(_syscall(VFS_PROC_NR, VFS_UTIMENS, &m));
}