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 f852a8b299df689d70063b714065c99b4fbee823..f7c43277a20576f16fc20f9f965e7f24e1fe2b67 100644 (file)
--- 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 6fa63f2fc7d9d7b8b4f6545b17dac0cf9c3b0b81..f7f9abce03ef66914c5e66af8acea2be82cbcb39 100644 (file)
--- 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;