mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-27 05:00:15 +00:00
9964a14579
This patch mechanically removes all remaining uses, and the definitions, of the following libio name aliases: name replaced with ---- ------------- _IO_FILE FILE _IO_fpos_t __fpos_t _IO_fpos64_t __fpos64_t _IO_size_t size_t _IO_ssize_t ssize_t or __ssize_t _IO_off_t off_t _IO_off64_t off64_t _IO_pid_t pid_t _IO_uid_t uid_t _IO_wint_t wint_t _IO_va_list va_list or __gnuc_va_list _IO_BUFSIZ BUFSIZ _IO_cookie_io_functions_t cookie_io_functions_t __io_read_fn cookie_read_function_t __io_write_fn cookie_write_function_t __io_seek_fn cookie_seek_function_t __io_close_fn cookie_close_function_t I used __fpos_t and __fpos64_t instead of fpos_t and fpos64_t because the definitions of fpos_t and fpos64_t depend on the largefile mode. I used __ssize_t and __gnuc_va_list in a handful of headers where namespace cleanliness might be relevant even though they're internal-use-only. In all other cases, I used the public-namespace name. There are a tiny handful of places where I left a use of 'struct _IO_FILE' alone, because it was being used together with 'struct _IO_FILE_plus' or 'struct _IO_FILE_complete' in the same arithmetic expression. Because this patch was almost entirely done with search and replace, I may have introduced indentation botches. I did proofread the diff, but I may have missed something. The ChangeLog below calls out all of the places where this was not a pure search-and-replace change. Installed stripped libraries and executables are unchanged by this patch, except that some assertions in vfscanf.c change line numbers. * libio/libio.h (_IO_FILE): Delete; all uses changed to FILE. (_IO_fpos_t): Delete; all uses changed to __fpos_t. (_IO_fpos64_t): Delete; all uses changed to __fpos64_t. (_IO_size_t): Delete; all uses changed to size_t. (_IO_ssize_t): Delete; all uses changed to ssize_t or __ssize_t. (_IO_off_t): Delete; all uses changed to off_t. (_IO_off64_t): Delete; all uses changed to off64_t. (_IO_pid_t): Delete; all uses changed to pid_t. (_IO_uid_t): Delete; all uses changed to uid_t. (_IO_wint_t): Delete; all uses changed to wint_t. (_IO_va_list): Delete; all uses changed to va_list or __gnuc_va_list. (_IO_BUFSIZ): Delete; all uses changed to BUFSIZ. (_IO_cookie_io_functions_t): Delete; all uses changed to cookie_io_functions_t. (__io_read_fn): Delete; all uses changed to cookie_read_function_t. (__io_write_fn): Delete; all uses changed to cookie_write_function_t. (__io_seek_fn): Delete; all uses changed to cookie_seek_function_t. (__io_close_fn): Delete: all uses changed to cookie_close_function_t. * libio/iofopncook.c: Remove unnecessary forward declarations. * libio/iolibio.h: Correct outdated commentary. * malloc/malloc.c (__malloc_stats): Remove unnecessary casts. * stdio-common/fxprintf.c (__fxprintf_nocancel): Remove unnecessary casts. * stdio-common/getline.c: Use _IO_getdelim directly. Don't redefine ssize_t. * stdio-common/printf_fp.c, stdio_common/printf_fphex.c * stdio-common/printf_size.c: Don't redefine size_t or FILE. Remove outdated comments. * stdio-common/vfscanf.c: Don't redefine va_list.
75 lines
2.5 KiB
C
75 lines
2.5 KiB
C
/* Copyright (C) 1991-2018 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <stdarg.h>
|
|
#include <wchar.h>
|
|
#include "../libio/libioP.h"
|
|
#include "../libio/strfile.h"
|
|
|
|
|
|
/* Write formatted output into S, according to the format
|
|
string FORMAT, writing no more than MAXLEN characters. */
|
|
/* VARARGS5 */
|
|
int
|
|
__vswprintf_chk (wchar_t *s, size_t maxlen, int flags, size_t slen,
|
|
const wchar_t *format, va_list args)
|
|
{
|
|
/* XXX Maybe for less strict version do not fail immediately.
|
|
Though, maxlen is supposed to be the size of buffer pointed
|
|
to by s, so a conforming program can't pass such maxlen
|
|
to *snprintf. */
|
|
if (__glibc_unlikely (slen < maxlen))
|
|
__chk_fail ();
|
|
|
|
_IO_wstrnfile sf;
|
|
struct _IO_wide_data wd;
|
|
int ret;
|
|
#ifdef _IO_MTSAFE_IO
|
|
sf.f._sbf._f._lock = NULL;
|
|
#endif
|
|
|
|
/* We need to handle the special case where MAXLEN is 0. Use the
|
|
overflow buffer right from the start. */
|
|
if (__glibc_unlikely (maxlen == 0))
|
|
/* Since we have to write at least the terminating L'\0' a buffer
|
|
length of zero always makes the function fail. */
|
|
return -1;
|
|
|
|
_IO_no_init (&sf.f._sbf._f, _IO_USER_LOCK, 0, &wd, &_IO_wstrn_jumps);
|
|
_IO_fwide (&sf.f._sbf._f, 1);
|
|
s[0] = L'\0';
|
|
|
|
/* For flags > 0 (i.e. __USE_FORTIFY_LEVEL > 1) request that %n
|
|
can only come from read-only format strings. */
|
|
if (flags > 0)
|
|
sf.f._sbf._f._flags2 |= _IO_FLAGS2_FORTIFY;
|
|
|
|
_IO_wstr_init_static (&sf.f._sbf._f, s, maxlen - 1, s);
|
|
ret = _IO_vfwprintf ((FILE *) &sf.f._sbf, format, args);
|
|
|
|
if (sf.f._sbf._f._wide_data->_IO_buf_base == sf.overflow_buf)
|
|
/* ISO C99 requires swprintf/vswprintf to return an error if the
|
|
output does not fit int he provided buffer. */
|
|
return -1;
|
|
|
|
/* Terminate the string. */
|
|
*sf.f._sbf._f._wide_data->_IO_write_ptr = '\0';
|
|
|
|
return ret;
|
|
}
|
|
libc_hidden_def (__vswprintf_chk)
|