From c2cd25bff89c3581780e7eb267262cb8c4da0d38 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Wed, 6 Apr 2011 20:32:53 -0400 Subject: consistency: change all remaining syscalls to use SYS_ rather than __NR_ prefix --- src/unistd/ftruncate.c | 2 +- src/unistd/lseek.c | 2 +- src/unistd/nice.c | 2 +- src/unistd/pread.c | 2 +- src/unistd/pwrite.c | 2 +- src/unistd/setgid.c | 2 +- src/unistd/setregid.c | 2 +- src/unistd/setresgid.c | 2 +- src/unistd/setresuid.c | 2 +- src/unistd/setreuid.c | 2 +- src/unistd/setuid.c | 2 +- src/unistd/truncate.c | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src/unistd') diff --git a/src/unistd/ftruncate.c b/src/unistd/ftruncate.c index f57ea120..7ed69ff6 100644 --- a/src/unistd/ftruncate.c +++ b/src/unistd/ftruncate.c @@ -4,7 +4,7 @@ int ftruncate(int fd, off_t length) { - return syscall(__NR_ftruncate, fd, __SYSCALL_LL(length)); + return syscall(SYS_ftruncate, fd, __SYSCALL_LL(length)); } LFS64(ftruncate); diff --git a/src/unistd/lseek.c b/src/unistd/lseek.c index 63cea588..0a5ed392 100644 --- a/src/unistd/lseek.c +++ b/src/unistd/lseek.c @@ -4,7 +4,7 @@ off_t lseek(int fd, off_t offset, int whence) { -#ifdef __NR__llseek +#ifdef SYS__llseek off_t result; return syscall(SYS__llseek, fd, offset>>32, offset, &result, whence) ? -1 : result; #else diff --git a/src/unistd/nice.c b/src/unistd/nice.c index 34f7c7f9..da569967 100644 --- a/src/unistd/nice.c +++ b/src/unistd/nice.c @@ -4,7 +4,7 @@ int nice(int inc) { -#ifdef __NR_nice +#ifdef SYS_nice return syscall(SYS_nice, inc); #else return setpriority(PRIO_PROCESS, 0, getpriority(PRIO_PROCESS, 0)+inc); diff --git a/src/unistd/pread.c b/src/unistd/pread.c index 16320e2c..0a045013 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 = syscall(__NR_pread, fd, buf, size, __SYSCALL_LL(ofs)); + r = syscall(SYS_pread, fd, buf, size, __SYSCALL_LL(ofs)); CANCELPT_END; return r; } diff --git a/src/unistd/pwrite.c b/src/unistd/pwrite.c index c4d3aff5..f878bb63 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 = syscall(__NR_pwrite, fd, buf, size, __SYSCALL_LL(ofs)); + r = syscall(SYS_pwrite, fd, buf, size, __SYSCALL_LL(ofs)); CANCELPT_END; return r; } diff --git a/src/unistd/setgid.c b/src/unistd/setgid.c index b54d2b22..87b2717e 100644 --- a/src/unistd/setgid.c +++ b/src/unistd/setgid.c @@ -4,5 +4,5 @@ int setgid(gid_t gid) { - return __rsyscall(__NR_setgid, gid, 0, 0, 0, 0, 0); + return __rsyscall(SYS_setgid, gid, 0, 0, 0, 0, 0); } diff --git a/src/unistd/setregid.c b/src/unistd/setregid.c index 49c59858..665b5556 100644 --- a/src/unistd/setregid.c +++ b/src/unistd/setregid.c @@ -4,5 +4,5 @@ int setregid(gid_t rgid, gid_t egid) { - return __rsyscall(__NR_setregid, rgid, egid, 0, 0, 0, 0); + return __rsyscall(SYS_setregid, rgid, egid, 0, 0, 0, 0); } diff --git a/src/unistd/setresgid.c b/src/unistd/setresgid.c index 2b0c96d8..9b9fe50b 100644 --- a/src/unistd/setresgid.c +++ b/src/unistd/setresgid.c @@ -5,5 +5,5 @@ int setresgid(gid_t rgid, gid_t egid, gid_t sgid) { - return __rsyscall(__NR_setresgid, rgid, egid, sgid, 0, 0, 0); + return __rsyscall(SYS_setresgid, rgid, egid, sgid, 0, 0, 0); } diff --git a/src/unistd/setresuid.c b/src/unistd/setresuid.c index 7fa6bc38..497f7592 100644 --- a/src/unistd/setresuid.c +++ b/src/unistd/setresuid.c @@ -5,5 +5,5 @@ int setresuid(uid_t ruid, uid_t euid, uid_t suid) { - return __rsyscall(__NR_setresuid, ruid, euid, suid, 0, 0, 0); + return __rsyscall(SYS_setresuid, ruid, euid, suid, 0, 0, 0); } diff --git a/src/unistd/setreuid.c b/src/unistd/setreuid.c index d926454a..93d68c03 100644 --- a/src/unistd/setreuid.c +++ b/src/unistd/setreuid.c @@ -4,5 +4,5 @@ int setreuid(uid_t ruid, uid_t euid) { - return __rsyscall(__NR_setreuid, ruid, euid, 0, 0, 0, 0); + return __rsyscall(SYS_setreuid, ruid, euid, 0, 0, 0, 0); } diff --git a/src/unistd/setuid.c b/src/unistd/setuid.c index da6816de..e778c7f3 100644 --- a/src/unistd/setuid.c +++ b/src/unistd/setuid.c @@ -4,5 +4,5 @@ int setuid(uid_t uid) { - return __rsyscall(__NR_setuid, uid, 0, 0, 0, 0, 0); + return __rsyscall(SYS_setuid, uid, 0, 0, 0, 0, 0); } diff --git a/src/unistd/truncate.c b/src/unistd/truncate.c index 3edacd12..461f6de1 100644 --- a/src/unistd/truncate.c +++ b/src/unistd/truncate.c @@ -4,7 +4,7 @@ int truncate(const char *path, off_t length) { - return syscall(__NR_truncate, path, __SYSCALL_LL(length)); + return syscall(SYS_truncate, path, __SYSCALL_LL(length)); } LFS64(truncate); -- cgit v1.2.1