diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2013-02-08 01:12:11 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2013-02-08 01:12:11 +0000 |
| commit | f3aae3f3eb4e4345413dc238e941cdb52f747d16 (patch) | |
| tree | d1613e7ec39b9d5b7c9b53a286fc653093721594 /sysdeps/unix/sysv/linux/shmctl.c | |
| parent | b2c9eff43c49d528c7ad3d0d91d03ccf0ae5ae0f (diff) | |
| download | glibc-f3aae3f3eb4e4345413dc238e941cdb52f747d16.tar.gz glibc-f3aae3f3eb4e4345413dc238e941cdb52f747d16.tar.xz glibc-f3aae3f3eb4e4345413dc238e941cdb52f747d16.zip | |
Remove CHECK_1 and CHECK_1_NULL_OK.
Diffstat (limited to 'sysdeps/unix/sysv/linux/shmctl.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/shmctl.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sysdeps/unix/sysv/linux/shmctl.c b/sysdeps/unix/sysv/linux/shmctl.c index 01dbdd087d..10b0ccdf35 100644 --- a/sysdeps/unix/sysv/linux/shmctl.c +++ b/sysdeps/unix/sysv/linux/shmctl.c @@ -25,7 +25,6 @@ #include <sys/syscall.h> #include <bits/wordsize.h> #include <shlib-compat.h> -#include <bp-checks.h> #include <kernel-features.h> @@ -64,8 +63,7 @@ int attribute_compat_text_section __old_shmctl (int shmid, int cmd, struct __old_shmid_ds *buf) { - return INLINE_SYSCALL (ipc, 5, IPCOP_shmctl, shmid, - cmd, 0, CHECK_1_NULL_OK (buf)); + return INLINE_SYSCALL (ipc, 5, IPCOP_shmctl, shmid, cmd, 0, buf); } compat_symbol (libc, __old_shmctl, shmctl, GLIBC_2_0); #endif @@ -75,7 +73,7 @@ __new_shmctl (int shmid, int cmd, struct shmid_ds *buf) { #if __ASSUME_IPC64 > 0 return INLINE_SYSCALL (ipc, 5, IPCOP_shmctl, shmid, cmd | __IPC_64, 0, - CHECK_1 (buf)); + buf); #else switch (cmd) { case SHM_STAT: @@ -86,8 +84,7 @@ __new_shmctl (int shmid, int cmd, struct shmid_ds *buf) #endif break; default: - return INLINE_SYSCALL (ipc, 5, IPCOP_shmctl, shmid, cmd, 0, - CHECK_1 (buf)); + return INLINE_SYSCALL (ipc, 5, IPCOP_shmctl, shmid, cmd, 0, buf); } { @@ -101,7 +98,7 @@ __new_shmctl (int shmid, int cmd, struct shmid_ds *buf) /* Unfortunately there is no way how to find out for sure whether we should use old or new shmctl. */ result = INLINE_SYSCALL (ipc, 5, IPCOP_shmctl, shmid, cmd | __IPC_64, 0, - CHECK_1 (buf)); + buf); if (result != -1 || errno != EINVAL) return result; |