aboutsummaryrefslogtreecommitdiff
path: root/sysdeps
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-04-20 04:31:12 +0000
committerUlrich Drepper <drepper@redhat.com>2004-04-20 04:31:12 +0000
commitbfa2612286e765dc52b510fdb753a238f0a1126d (patch)
treedf808248e992d939d520271421a71f4f974eb95f /sysdeps
parentd3b520289178bbe9c252c0a2784a529b89951945 (diff)
downloadglibc-bfa2612286e765dc52b510fdb753a238f0a1126d.zip
glibc-bfa2612286e765dc52b510fdb753a238f0a1126d.tar.gz
glibc-bfa2612286e765dc52b510fdb753a238f0a1126d.tar.bz2
Update.
2004-04-19 Ulrich Drepper <drepper@redhat.com> * sysdeps/unix/sysv/linux/mq_unlink.c: Rewrite to produce more compact code.
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/unix/sysv/linux/mq_unlink.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/sysdeps/unix/sysv/linux/mq_unlink.c b/sysdeps/unix/sysv/linux/mq_unlink.c
index 4344c5d..8d87ffa 100644
--- a/sysdeps/unix/sysv/linux/mq_unlink.c
+++ b/sysdeps/unix/sysv/linux/mq_unlink.c
@@ -32,12 +32,19 @@ mq_unlink (const char *name)
return -1;
}
- int ret = INLINE_SYSCALL (mq_unlink, 1, name + 1);
+ INTERNAL_SYSCALL_DECL (err);
+ int ret = INTERNAL_SYSCALL (mq_unlink, err, 1, name + 1);
/* While unlink can return either EPERM or EACCES, mq_unlink should
return just EACCES. */
- if (ret < 0 && errno == EPERM)
- __set_errno (EACCES);
+ if (__builtin_expect (INTERNAL_SYSCALL_ERROR_P (ret, err), 0))
+ {
+ ret = INTERNAL_SYSCALL_ERRNO (ret, err);
+ if (ret == EPERM)
+ ret = EACCES;
+ __set_errno (ret);
+ ret = -1;
+ }
return ret;
}