From 685e40bb09f5f24a2af54ea09c97328808f76990 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Sat, 19 Mar 2011 21:36:10 -0400 Subject: 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. --- src/time/clock_nanosleep.c | 3 +-- src/time/gettimeofday.c | 3 +-- src/time/time.c | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) (limited to 'src/time') diff --git a/src/time/clock_nanosleep.c b/src/time/clock_nanosleep.c index ffb9a8af..c777c179 100644 --- a/src/time/clock_nanosleep.c +++ b/src/time/clock_nanosleep.c @@ -1,4 +1,3 @@ -#define SYSCALL_RETURN_ERRNO #include #include "syscall.h" #include "libc.h" @@ -7,7 +6,7 @@ int clock_nanosleep(clockid_t clk, int flags, const struct timespec *req, struct { int ret; CANCELPT_BEGIN; - ret = syscall4(__NR_clock_nanosleep, clk, flags, (long)req, (long)rem); + ret = __syscall(__NR_clock_nanosleep, clk, flags, req, rem); CANCELPT_END; return ret; } diff --git a/src/time/gettimeofday.c b/src/time/gettimeofday.c index 2b8a287d..521b4d57 100644 --- a/src/time/gettimeofday.c +++ b/src/time/gettimeofday.c @@ -1,9 +1,8 @@ -#define SYSCALL_RETURN_ERRNO #include #include "syscall.h" int gettimeofday(struct timeval *tv, void *tz) { - syscall2(__NR_gettimeofday, (long)tv, 0); + __syscall(__NR_gettimeofday, tv, 0); return 0; } diff --git a/src/time/time.c b/src/time/time.c index 3457dade..2d2cfd44 100644 --- a/src/time/time.c +++ b/src/time/time.c @@ -1,4 +1,3 @@ -#define SYSCALL_RETURN_ERRNO #include #include #include "syscall.h" @@ -6,7 +5,7 @@ time_t time(time_t *t) { struct timeval tv; - syscall2(__NR_gettimeofday, (long)&tv, 0); + __syscall(__NR_gettimeofday, &tv, 0); if (t) *t = tv.tv_sec; return tv.tv_sec; } -- cgit v1.2.1