diff options
author | jhb <jhb@FreeBSD.org> | 2008-04-17 22:17:54 +0000 |
---|---|---|
committer | jhb <jhb@FreeBSD.org> | 2008-04-17 22:17:54 +0000 |
commit | ab875ea72654fac71cb13470c85b43412c2e2391 (patch) | |
tree | b259dd878c8cb0ee9fb15608aebb9453ad10e7b1 /lib/libc/stdio/fseek.c | |
parent | ed4c4d169e660b4253a11c7915cd7a01c4b11398 (diff) | |
download | FreeBSD-src-ab875ea72654fac71cb13470c85b43412c2e2391.zip FreeBSD-src-ab875ea72654fac71cb13470c85b43412c2e2391.tar.gz |
Next stage of stdio cleanup: Retire __sFILEX and merge the fields back into
__sFILE. This was supposed to be done in 6.0. Some notes:
- Where possible I restored the various lines to their pre-__sFILEX state.
- Retire INITEXTRA() and just initialize the wchar bits (orientation and
mbstate) explicitly instead. The various places that used INITEXTRA
didn't need the locking fields or _up initialized. (Some places needed
_up to exist and not be off the end of a NULL or garbage pointer, but
they didn't require it to be initialized to a specific value.)
- For now, stdio.h "knows" that pthread_t is a 'struct pthread *' to
avoid namespace pollution of including all the pthread types in stdio.h.
Once we remove all the inlines and make __sFILE private it can go back
to using pthread_t, etc.
- This does not remove any of the inlines currently and does not change
any of the public ABI of 'FILE'.
MFC after: 1 month
Reviewed by: peter
Diffstat (limited to 'lib/libc/stdio/fseek.c')
-rw-r--r-- | lib/libc/stdio/fseek.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/libc/stdio/fseek.c b/lib/libc/stdio/fseek.c index 8482d0d..c934349 100644 --- a/lib/libc/stdio/fseek.c +++ b/lib/libc/stdio/fseek.c @@ -233,7 +233,7 @@ _fseeko(fp, offset, whence, ltest) */ if (HASUB(fp)) { curoff += fp->_r; /* kill off ungetc */ - n = fp->_extra->_up - fp->_bf._base; + n = fp->_up - fp->_bf._base; curoff -= n; n += fp->_ur; } else { @@ -255,7 +255,7 @@ _fseeko(fp, offset, whence, ltest) if (HASUB(fp)) FREEUB(fp); fp->_flags &= ~__SEOF; - memset(&fp->_extra->mbstate, 0, sizeof(mbstate_t)); + memset(&fp->_mbstate, 0, sizeof(mbstate_t)); return (0); } @@ -283,7 +283,7 @@ abspos: fp->_r -= n; } fp->_flags &= ~__SEOF; - memset(&fp->_extra->mbstate, 0, sizeof(mbstate_t)); + memset(&fp->_mbstate, 0, sizeof(mbstate_t)); return (0); /* @@ -306,6 +306,6 @@ dumb: fp->_r = 0; /* fp->_w = 0; */ /* unnecessary (I think...) */ fp->_flags &= ~__SEOF; - memset(&fp->_extra->mbstate, 0, sizeof(mbstate_t)); + memset(&fp->_mbstate, 0, sizeof(mbstate_t)); return (0); } |