aboutsummaryrefslogtreecommitdiff
path: root/libio/ioseekoff.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-11-05 08:43:05 +0000
committerUlrich Drepper <drepper@redhat.com>2002-11-05 08:43:05 +0000
commit52a16e580103729ad0cc228b564a811a7a19cc8d (patch)
tree5e4e86a3524a484fcbbc461646f0fa3e279e3e64 /libio/ioseekoff.c
parent2fdeb7ca4f50e84886ddf8c8241e008c2808fe40 (diff)
downloadglibc-52a16e580103729ad0cc228b564a811a7a19cc8d.zip
glibc-52a16e580103729ad0cc228b564a811a7a19cc8d.tar.gz
glibc-52a16e580103729ad0cc228b564a811a7a19cc8d.tar.bz2
Update.
2002-11-05 Ulrich Drepper <drepper@redhat.com> * libio/ioseekoff.c: Remove INTDEF. Define _IO_seekoff_unlocked. Same as old code without locking. _IO_seekoff calls this function after locking the stream. * libio/ioseekpos.c: Likewise for _IO_seekpos. * libio/libioP.h: Replace _IO_seekoff_internal and _IO_seekpos_internal prototypes with _IO_seekoff_unlocked and _IO_seekpos_unlocked prototypes. * libio/iolibio.h (_IO_fseek): Call _IO_seekoff_unlocked instead of _IO_seekoff_internal. (_IO_rewind): Likewise. * libio/ioftell.c: Likewise. * libio/ftello.c: Likewise. * libio/ftello64.c: Likewise. * libio/iofgetpos.c: Likewise. * libio/iofgetpos64.c: Likewise. * libio/oldiofgetpos.c: Likewise. * libio/oldiofgetpos64.c: Likewise. * libio/iofsetpos.c: Call _IO_seekpos_unlocked instead of _IO_seekpos_internal. * libio/iofsetpos64.c: Likewise. * libio/oldiofsetpos.c: Likewise. * libio/oldiofsetpos64.c: Likewise. * libio/wfileops.c (_IO_wfile_seekoff): Don't modify _offset and _wide_data->_IO_read_end if adjustment can be made in the current buffer.
Diffstat (limited to 'libio/ioseekoff.c')
-rw-r--r--libio/ioseekoff.c26
1 files changed, 18 insertions, 8 deletions
diff --git a/libio/ioseekoff.c b/libio/ioseekoff.c
index eff6d38..09c1388 100644
--- a/libio/ioseekoff.c
+++ b/libio/ioseekoff.c
@@ -36,14 +36,12 @@ extern int errno;
#endif
_IO_off64_t
-_IO_seekoff (fp, offset, dir, mode)
+_IO_seekoff_unlocked (fp, offset, dir, mode)
_IO_FILE *fp;
_IO_off64_t offset;
int dir;
int mode;
{
- _IO_off64_t retval;
-
if (dir != _IO_seek_cur && dir != _IO_seek_set && dir != _IO_seek_end)
{
__set_errno (EINVAL);
@@ -53,9 +51,6 @@ _IO_seekoff (fp, offset, dir, mode)
/* If we have a backup buffer, get rid of it, since the __seekoff
callback may not know to do the right thing about it.
This may be over-kill, but it'll do for now. TODO */
- _IO_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, fp);
- _IO_flockfile (fp);
-
if (mode != 0 && ((_IO_fwide (fp, 0) < 0 && _IO_have_backup (fp))
|| (_IO_fwide (fp, 0) > 0 && _IO_have_wbackup (fp))))
{
@@ -72,10 +67,25 @@ _IO_seekoff (fp, offset, dir, mode)
INTUSE(_IO_free_wbackup_area) (fp);
}
- retval = _IO_SEEKOFF (fp, offset, dir, mode);
+ return _IO_SEEKOFF (fp, offset, dir, mode);
+}
+
+
+_IO_off64_t
+_IO_seekoff (fp, offset, dir, mode)
+ _IO_FILE *fp;
+ _IO_off64_t offset;
+ int dir;
+ int mode;
+{
+ _IO_off64_t retval;
+
+ _IO_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, fp);
+ _IO_flockfile (fp);
+
+ retval = _IO_seekoff_unlocked (fp, offset, dir, mode);
_IO_funlockfile (fp);
_IO_cleanup_region_end (0);
return retval;
}
-INTDEF(_IO_seekoff)