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

@ -11,8 +11,8 @@ int semctl(int id, int num, int cmd, ...)
arg = va_arg(ap, long);
va_end(ap);
#ifdef __NR_semctl
return syscall4(__NR_semctl, id, num, cmd, arg);
return syscall(SYS_semctl, id, num, cmd, arg);
#else
return syscall5(__NR_ipc, IPCOP_semctl, id, num, cmd | 0x100, (long)&arg);
return syscall(SYS_ipc, IPCOP_semctl, id, num, cmd | 0x100, &arg);
#endif
}

View File

@ -5,8 +5,8 @@
int semget(key_t key, int n, int fl)
{
#ifdef __NR_semget
return syscall3(__NR_semget, key, n, fl);
return syscall(SYS_semget, key, n, fl);
#else
return syscall4(__NR_ipc, IPCOP_semget, key, n, fl);
return syscall(SYS_ipc, IPCOP_semget, key, n, fl);
#endif
}

View File

@ -5,8 +5,8 @@
int semop(int id, struct sembuf *buf, size_t n)
{
#ifdef __NR_semop
return syscall3(__NR_semop, id, (long)buf, n);
return syscall(SYS_semop, id, buf, n);
#else
return syscall5(__NR_ipc, IPCOP_semop, id, n, 0, (long)buf);
return syscall(SYS_ipc, IPCOP_semop, id, n, 0, buf);
#endif
}

View File

@ -5,13 +5,13 @@
#ifdef __NR_shmat
void *shmat(int id, const void *addr, int flag)
{
return (void *)syscall3(__NR_shmat, id, (long)addr, flag);
return (void *)syscall(SYS_shmat, id, addr, flag);
}
#else
void *shmat(int id, const void *addr, int flag)
{
unsigned long ret;
ret = syscall5(__NR_ipc, IPCOP_shmat, id, flag, (long)&addr, (long)addr);
ret = syscall(SYS_ipc, IPCOP_shmat, id, flag, &addr, addr);
return (ret > -(unsigned long)SHMLBA) ? (void *)ret : (void *)addr;
}
#endif

View File

@ -5,8 +5,8 @@
int shmctl(int id, int cmd, struct shmid_ds *buf)
{
#ifdef __NR_shmctl
return syscall3(__NR_shmctl, id, cmd, (long)buf);
return syscall(SYS_shmctl, id, cmd, buf);
#else
return syscall4(__NR_ipc, IPCOP_shmctl, id, cmd | IPC_MODERN, (long)buf);
return syscall(SYS_ipc, IPCOP_shmctl, id, cmd | IPC_MODERN, buf);
#endif
}

View File

@ -5,8 +5,8 @@
int shmdt(const void *addr)
{
#ifdef __NR_shmdt
return syscall1(__NR_shmdt, (long)addr);
return syscall(SYS_shmdt, addr);
#else
return syscall2(__NR_ipc, IPCOP_shmdt, (long)addr);
return syscall(SYS_ipc, IPCOP_shmdt, addr);
#endif
}

View File

@ -5,8 +5,8 @@
int shmget(key_t key, size_t size, int flag)
{
#ifdef __NR_shmget
return syscall3(__NR_shmget, key, size, flag);
return syscall(SYS_shmget, key, size, flag);
#else
return syscall4(__NR_ipc, IPCOP_shmget, key, size, flag);
return syscall(SYS_ipc, IPCOP_shmget, key, size, flag);
#endif
}