summaryrefslogtreecommitdiff
path: root/src/unistd
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2011-03-19 21:36:10 -0400
committerRich Felker <dalias@aerifal.cx>2011-03-19 21:36:10 -0400
commit685e40bb09f5f24a2af54ea09c97328808f76990 (patch)
tree73bbf60045bb3a9c8af4f2639e8adb2ad1ea6994 /src/unistd
parent462dbfc20788a6c9dd1ea4bb1cef086aa189615a (diff)
downloadmusl-685e40bb09f5f24a2af54ea09c97328808f76990.tar.gz
musl-685e40bb09f5f24a2af54ea09c97328808f76990.tar.bz2
musl-685e40bb09f5f24a2af54ea09c97328808f76990.tar.xz
musl-685e40bb09f5f24a2af54ea09c97328808f76990.zip
syscall overhaul part two - unify public and internal syscall interface
with this patch, the syscallN() functions are no longer needed; a variadic syscall() macro allows syscalls with anywhere from 0 to 6 arguments to be made with a single macro name. also, manually casting each non-integer argument with (long) is no longer necessary; the casts are hidden in the macros. some source files which depended on being able to define the old macro SYSCALL_RETURNS_ERRNO have been modified to directly use __syscall() instead of syscall(). references to SYSCALL_SIGSET_SIZE and SYSCALL_LL have also been changed. x86_64 has not been tested, and may need a follow-up commit to fix any minor bugs/oversights.
Diffstat (limited to 'src/unistd')
-rw-r--r--src/unistd/ftruncate.c2
-rw-r--r--src/unistd/pread.c2
-rw-r--r--src/unistd/pwrite.c2
-rw-r--r--src/unistd/truncate.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/unistd/ftruncate.c b/src/unistd/ftruncate.c
index db5da844..f57ea120 100644
--- a/src/unistd/ftruncate.c
+++ b/src/unistd/ftruncate.c
@@ -4,7 +4,7 @@
int ftruncate(int fd, off_t length)
{
- return syscall3(__NR_ftruncate, fd, SYSCALL_LL(length));
+ return syscall(__NR_ftruncate, fd, __SYSCALL_LL(length));
}
LFS64(ftruncate);
diff --git a/src/unistd/pread.c b/src/unistd/pread.c
index 534215ac..16320e2c 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_pread, fd, (long)buf, size, SYSCALL_LL(ofs));
+ r = syscall(__NR_pread, fd, buf, size, __SYSCALL_LL(ofs));
CANCELPT_END;
return r;
}
diff --git a/src/unistd/pwrite.c b/src/unistd/pwrite.c
index 56ed6b4c..c4d3aff5 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_pwrite, fd, (long)buf, size, SYSCALL_LL(ofs));
+ r = syscall(__NR_pwrite, fd, buf, size, __SYSCALL_LL(ofs));
CANCELPT_END;
return r;
}
diff --git a/src/unistd/truncate.c b/src/unistd/truncate.c
index 322349d2..3edacd12 100644
--- a/src/unistd/truncate.c
+++ b/src/unistd/truncate.c
@@ -4,7 +4,7 @@
int truncate(const char *path, off_t length)
{
- return syscall3(__NR_truncate, (long)path, SYSCALL_LL(length));
+ return syscall(__NR_truncate, path, __SYSCALL_LL(length));
}
LFS64(truncate);