From cfe373146d232d7c89a60920f77b9451bcfee96b Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Tue, 15 Feb 2011 04:12:19 -0500 Subject: finish moving 32-bit-specific junk out of source files. --- src/unistd/ftruncate.c | 7 +------ src/unistd/pread.c | 2 +- src/unistd/pwrite.c | 2 +- src/unistd/truncate.c | 7 +------ 4 files changed, 4 insertions(+), 14 deletions(-) (limited to 'src/unistd') diff --git a/src/unistd/ftruncate.c b/src/unistd/ftruncate.c index e0b2f4bb..db5da844 100644 --- a/src/unistd/ftruncate.c +++ b/src/unistd/ftruncate.c @@ -4,12 +4,7 @@ int ftruncate(int fd, off_t length) { - if (sizeof(long) == 8) - return syscall2(__NR_ftruncate, fd, length); - else { - union { long long ll; long l[2]; } u = { length }; - return syscall3(__NR_ftruncate64, fd, u.l[0], u.l[1]); - } + return syscall3(__NR_ftruncate, fd, SYSCALL_LL(length)); } LFS64(ftruncate); diff --git a/src/unistd/pread.c b/src/unistd/pread.c index 029ba3d1..534215ac 100644 --- a/src/unistd/pread.c +++ b/src/unistd/pread.c @@ -6,7 +6,7 @@ ssize_t pread(int fd, void *buf, size_t size, off_t ofs) { ssize_t r; CANCELPT_BEGIN; - r = syscall5(__NR_pread64, fd, (long)buf, size, SYSCALL_LL(ofs)); + r = syscall5(__NR_pread, fd, (long)buf, size, SYSCALL_LL(ofs)); CANCELPT_END; return r; } diff --git a/src/unistd/pwrite.c b/src/unistd/pwrite.c index 8f23d1b9..56ed6b4c 100644 --- a/src/unistd/pwrite.c +++ b/src/unistd/pwrite.c @@ -6,7 +6,7 @@ ssize_t pwrite(int fd, const void *buf, size_t size, off_t ofs) { ssize_t r; CANCELPT_BEGIN; - r = syscall5(__NR_pwrite64, fd, (long)buf, size, SYSCALL_LL(ofs)); + r = syscall5(__NR_pwrite, fd, (long)buf, size, SYSCALL_LL(ofs)); CANCELPT_END; return r; } diff --git a/src/unistd/truncate.c b/src/unistd/truncate.c index f75e824e..322349d2 100644 --- a/src/unistd/truncate.c +++ b/src/unistd/truncate.c @@ -4,12 +4,7 @@ int truncate(const char *path, off_t length) { - if (sizeof(long) == 8) - return syscall2(__NR_truncate, (long)path, length); - else { - union { long long ll; long l[2]; } u = { length }; - return syscall3(__NR_truncate64, (long)path, u.l[0], u.l[1]); - } + return syscall3(__NR_truncate, (long)path, SYSCALL_LL(length)); } LFS64(truncate); -- cgit v1.2.1