aboutsummaryrefslogtreecommitdiff
path: root/io
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-08-31 16:30:27 +0000
committerUlrich Drepper <drepper@redhat.com>1998-08-31 16:30:27 +0000
commitbfce746a87e205a682b85e144e056029a8a30d07 (patch)
tree081313643ad086d15559161dc218d203b62f605d /io
parentac72fbb190675473855c33d79ccd75b0de68c0d1 (diff)
downloadglibc-bfce746a87e205a682b85e144e056029a8a30d07.zip
glibc-bfce746a87e205a682b85e144e056029a8a30d07.tar.gz
glibc-bfce746a87e205a682b85e144e056029a8a30d07.tar.bz2
Update.
1998-08-31 15:56 Ulrich Drepper <drepper@cygnus.com> * db2/db_int.h: Use <db.h> instead of "db.h" to find header in include. * include/stdio.h: Add __vsscanf. * libio/stdio.h: Make vfscanf, scanf, and vsscanf available if __USE_ISOC9X. Remove __vsscanf declaration. Always declare fgetpos and fsetpos. * math/math.h: Define isinf as macro. * math/bits/mathcalls.h: Change to declare __isinf all the time. Don't declare scalb for ISO C 9x. * math/tgmath.h: Define fma. Rewrite the underlying macros. * stdlib/stdlib.h: Declare strtof and strtold is __USE_ISOC9X. * sysdeps/unix/sysv/linux/bits/sigcontext.h: Allow inclusion from sys/ucontext.h. * sysdeps/wordsize-32/inttypes.h: Define missing PRI* and SCN* macros. 1998-08-31 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/standalone/bits/errno.h (ENOMSG): Remove duplicate. Reported by jreising@frequentis.com [PR libc/767]. 1998-08-31 Andreas Jaeger <aj@arthur.rhein-neckar.de> * io/lockf.c (lockf): Move initilisation of fl.l_whence and fl.l_start at beginning of function. Patch by Geoff. Dash <geoffd@zeta.org.au> [PR libc/769].
Diffstat (limited to 'io')
-rw-r--r--io/lockf.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/io/lockf.c b/io/lockf.c
index 6d50490..6e8851b 100644
--- a/io/lockf.c
+++ b/io/lockf.c
@@ -31,6 +31,11 @@ lockf (int fd, int cmd, off_t len)
memset ((char *) &fl, '\0', sizeof (fl));
+ /* lockf is always relative to the current file position. */
+ fl.l_whence = SEEK_CUR;
+ fl.l_start = 0;
+ fl.l_len = len;
+
switch (cmd)
{
case F_TEST:
@@ -61,11 +66,5 @@ lockf (int fd, int cmd, off_t len)
return -1;
}
- /* lockf is always relative to the current file position. */
- fl.l_whence = SEEK_CUR;
- fl.l_start = 0;
-
- fl.l_len = len;
-
return __fcntl (fd, cmd, &fl);
}