global cleanup to use the new syscall interface

This commit is contained in:
Rich Felker
2011-03-20 00:16:43 -04:00
parent be82e122bf
commit aa398f56fa
160 changed files with 180 additions and 238 deletions

View File

@ -3,10 +3,5 @@
int getitimer(int which, struct itimerval *old)
{
int ret;
long kold[4];
if (!(ret = syscall2(__NR_getitimer, which, (long)&kold)))
*old = (struct itimerval){ { kold[0], kold[1] }, { kold[2], kold[3] } };
return ret;
return syscall(SYS_getitimer, which, old);
}

View File

@ -3,5 +3,5 @@
int kill(pid_t pid, int sig)
{
return syscall2(__NR_kill, pid, sig);
return syscall(SYS_kill, pid, sig);
}

View File

@ -10,9 +10,9 @@ int raise(int sig)
sigset_t set;
sigfillset(&set);
__sigprocmask(SIG_BLOCK, &set, &set);
tid = syscall0(__NR_gettid);
pid = syscall0(__NR_getpid);
ret = syscall3(__NR_tgkill, pid, tid, sig);
tid = syscall(SYS_gettid);
pid = syscall(SYS_getpid);
ret = syscall(SYS_tgkill, pid, tid, sig);
__sigprocmask(SIG_SETMASK, &set, 0);
return ret;
}

View File

@ -3,13 +3,5 @@
int setitimer(int which, const struct itimerval *new, struct itimerval *old)
{
int ret;
long knew[4] = {
new->it_interval.tv_sec, new->it_interval.tv_usec,
new->it_value.tv_sec, new->it_value.tv_usec
}, kold[4];
if (!(ret = syscall3(__NR_setitimer, which, (long)&knew, old ? (long)&kold : 0)) && old)
*old = (struct itimerval){ { kold[0], kold[1] }, { kold[2], kold[3] } };
return ret;
return syscall(SYS_setitimer, which, new, old);
}

View File

@ -23,7 +23,7 @@ int __libc_sigaction(int sig, const struct sigaction *sa, struct sigaction *old)
pksa = (long)&ksa;
}
if (old) pkold = (long)&kold;
if (syscall4(__NR_rt_sigaction, sig, pksa, pkold, 8))
if (syscall(SYS_rt_sigaction, sig, pksa, pkold, 8))
return -1;
if (old) {
old->sa_handler = kold.handler;

View File

@ -14,5 +14,5 @@ int sigaltstack(const stack_t *ss, stack_t *old)
return -1;
}
}
return syscall2(__NR_sigaltstack, (long)ss, (long)old);
return syscall(SYS_sigaltstack, ss, old);
}

View File

@ -6,7 +6,7 @@
int __libc_sigprocmask(int how, const sigset_t *set, sigset_t *old)
{
return syscall4(__NR_rt_sigprocmask, how, (long)set, (long)old, 8);
return syscall(SYS_rt_sigprocmask, how, set, old, 8);
}
int __sigprocmask(int how, const sigset_t *set, sigset_t *old)

View File

@ -12,5 +12,5 @@ int sigqueue(pid_t pid, int sig, const union sigval value)
si.si_value = value;
si.si_pid = getpid();
si.si_uid = getuid();
return syscall3(__NR_rt_sigqueueinfo, pid, sig, (long)&si);
return syscall(SYS_rt_sigqueueinfo, pid, sig, &si);
}