OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Samuel Thibault 2018-11-30 02:36:54 +01:00
parent a5275ba537
commit c6a5bdc189
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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>

10
sysdeps/mach/hurd/fcntl.c
View File

@ -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;