From owner-cvs-all@FreeBSD.ORG Thu Apr 17 22:17:55 2008 Return-Path: Delivered-To: cvs-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D3BE2106566C; Thu, 17 Apr 2008 22:17:55 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BB8CA8FC20; Thu, 17 Apr 2008 22:17:55 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3HMHtrj010015; Thu, 17 Apr 2008 22:17:55 GMT (envelope-from jhb@repoman.freebsd.org) Received: (from jhb@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3HMHtIG010014; Thu, 17 Apr 2008 22:17:55 GMT (envelope-from jhb) Message-Id: <200804172217.m3HMHtIG010014@repoman.freebsd.org> From: John Baldwin Date: Thu, 17 Apr 2008 22:17:54 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: src/include stdio.h src/lib/libc/stdio _flock_stub.c asprintf.c fgetwc.c fgetws.c findfp.c fputwc.c fputws.c freopen.c fseek.c fwide.c local.h refill.c snprintf.c sprintf.c sscanf.c ungetc.c ungetwc.c vasprintf.c vfprintf.c vfwprintf.c vsnprintf.c ... X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Apr 2008 22:17:55 -0000 jhb 2008-04-17 22:17:54 UTC FreeBSD src repository Modified files: include stdio.h lib/libc/stdio _flock_stub.c asprintf.c fgetwc.c fgetws.c findfp.c fputwc.c fputws.c freopen.c fseek.c fwide.c local.h refill.c snprintf.c sprintf.c sscanf.c ungetc.c ungetwc.c vasprintf.c vfprintf.c vfwprintf.c vsnprintf.c vsprintf.c vsscanf.c vswprintf.c vswscanf.c xprintf.c Log: 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 Revision Changes Path 1.64 +7 -4 src/include/stdio.h 1.16 +16 -26 src/lib/libc/stdio/_flock_stub.c 1.14 +2 -3 src/lib/libc/stdio/asprintf.c 1.13 +1 -1 src/lib/libc/stdio/fgetwc.c 1.7 +2 -2 src/lib/libc/stdio/fgetws.c 1.32 +11 -45 src/lib/libc/stdio/findfp.c 1.11 +1 -2 src/lib/libc/stdio/fputwc.c 1.7 +1 -1 src/lib/libc/stdio/fputws.c 1.21 +2 -2 src/lib/libc/stdio/freopen.c 1.44 +4 -4 src/lib/libc/stdio/fseek.c 1.2 +3 -3 src/lib/libc/stdio/fwide.c 1.31 +2 -21 src/lib/libc/stdio/local.h 1.20 +1 -1 src/lib/libc/stdio/refill.c 1.22 +2 -3 src/lib/libc/stdio/snprintf.c 1.16 +2 -3 src/lib/libc/stdio/sprintf.c 1.13 +2 -3 src/lib/libc/stdio/sscanf.c 1.18 +1 -1 src/lib/libc/stdio/ungetc.c 1.11 +1 -1 src/lib/libc/stdio/ungetwc.c 1.19 +2 -3 src/lib/libc/stdio/vasprintf.c 1.78 +2 -1 src/lib/libc/stdio/vfprintf.c 1.29 +2 -1 src/lib/libc/stdio/vfwprintf.c 1.24 +2 -3 src/lib/libc/stdio/vsnprintf.c 1.16 +2 -3 src/lib/libc/stdio/vsprintf.c 1.14 +2 -3 src/lib/libc/stdio/vsscanf.c 1.7 +2 -3 src/lib/libc/stdio/vswprintf.c 1.5 +2 -3 src/lib/libc/stdio/vswscanf.c 1.6 +2 -1 src/lib/libc/stdio/xprintf.c