This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.28.9000-332-gc6a5bdc
- From: sthibaul at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 30 Nov 2018 01:42:46 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.28.9000-332-gc6a5bdc
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via c6a5bdc18979c09c7a2a9cf23fff8ac5781962ae (commit)
from a5275ba5378c9256d18e582572b4315e8edfcbfb (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=c6a5bdc18979c09c7a2a9cf23fff8ac5781962ae
commit c6a5bdc18979c09c7a2a9cf23fff8ac5781962ae
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Fri Nov 30 02:36:54 2018 +0100
hurd: Fix returning value for fcntl(F_*LK*)
to avoid calling va_end again, etc.
* sysdeps/mach/hurd/fcntl.c (__libc_fcntl): Directly return value
returned by __f_setlk.
diff --git a/ChangeLog b/ChangeLog
index f852a8b..f7c4327 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-11-30 Samuel Thibault <samuel.thibault@ens-lyon.org>
+
+ * sysdeps/mach/hurd/fcntl.c (__libc_fcntl): Directly return value
+ returned by __f_setlk.
+
2018-11-29 H.J. Lu <hongjiu.lu@intel.com>
Adhemerval Zanella <adhemerval.zanella@linaro.org>
diff --git a/sysdeps/mach/hurd/fcntl.c b/sysdeps/mach/hurd/fcntl.c
index 6fa63f2..f7f9abc 100644
--- a/sysdeps/mach/hurd/fcntl.c
+++ b/sysdeps/mach/hurd/fcntl.c
@@ -141,9 +141,8 @@ __libc_fcntl (int fd, int cmd, ...)
wait = 1;
/* FALLTHROUGH */
case F_SETLK:
- result = __f_setlk (fd, fl->l_type, fl->l_whence,
- fl->l_start, fl->l_len, wait);
- break;
+ return __f_setlk (fd, fl->l_type, fl->l_whence,
+ fl->l_start, fl->l_len, wait);
default:
errno = EINVAL;
return -1;
@@ -166,9 +165,8 @@ __libc_fcntl (int fd, int cmd, ...)
wait = 1;
/* FALLTHROUGH */
case F_SETLK:
- result = __f_setlk (fd, fl->l_type, fl->l_whence,
- fl->l_start, fl->l_len, wait);
- break;
+ return __f_setlk (fd, fl->l_type, fl->l_whence,
+ fl->l_start, fl->l_len, wait);
default:
errno = EINVAL;
return -1;
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
sysdeps/mach/hurd/fcntl.c | 10 ++++------
2 files changed, 9 insertions(+), 6 deletions(-)
hooks/post-receive
--
GNU C Library master sources