summaryrefslogtreecommitdiffstats
path: root/lib/libc/stdio/xprintf.c
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2008-04-17 22:17:54 +0000
committerjhb <jhb@FreeBSD.org>2008-04-17 22:17:54 +0000
commitab875ea72654fac71cb13470c85b43412c2e2391 (patch)
treeb259dd878c8cb0ee9fb15608aebb9453ad10e7b1 /lib/libc/stdio/xprintf.c
parented4c4d169e660b4253a11c7915cd7a01c4b11398 (diff)
downloadFreeBSD-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/xprintf.c')
-rw-r--r--lib/libc/stdio/xprintf.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/libc/stdio/xprintf.c b/lib/libc/stdio/xprintf.c
index 41ee4ab..df4b7d2 100644
--- a/lib/libc/stdio/xprintf.c
+++ b/lib/libc/stdio/xprintf.c
@@ -583,7 +583,8 @@ __v3printf(FILE *fp, const char *fmt, int pct, va_list ap)
fake._file = fp->_file;
fake._cookie = fp->_cookie;
fake._write = fp->_write;
- fake._extra = fp->_extra;
+ fake._orientation = fp->_orientation;
+ fake._mbstate = fp->_mbstate;
/* set up the buffer */
fake._bf._base = fake._p = buf;
OpenPOWER on IntegriCloud