mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-15 09:30:06 +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.
80 lines
2.8 KiB
C
80 lines
2.8 KiB
C
/* Copyright (C) 1993-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/>.
|
|
|
|
As a special exception, if you link the code in this file with
|
|
files compiled with a GNU compiler to produce an executable,
|
|
that does not cause the resulting executable to be covered by
|
|
the GNU Lesser General Public License. This exception does not
|
|
however invalidate any other reasons why the executable file
|
|
might be covered by the GNU Lesser General Public License.
|
|
This exception applies to code released by its copyright holders
|
|
in files containing the exception. */
|
|
|
|
/* We need to avoid the header declarations of these, because
|
|
the types don't match _IO_fsetpos and then the compiler will
|
|
complain about the mismatch when we do the alias below. */
|
|
#define _IO_new_fsetpos64 __renamed__IO_new_fsetpos64
|
|
#define _IO_fsetpos64 __renamed__IO_fsetpos64
|
|
#define fsetpos64 __renamed_fsetpos64
|
|
|
|
#include <libioP.h>
|
|
|
|
#undef _IO_new_fsetpos64
|
|
#undef _IO_fsetpos64
|
|
#undef fsetpos64
|
|
|
|
#include <errno.h>
|
|
#include <shlib-compat.h>
|
|
|
|
int
|
|
_IO_new_fsetpos (FILE *fp, const __fpos_t *posp)
|
|
{
|
|
int result;
|
|
CHECK_FILE (fp, EOF);
|
|
_IO_acquire_lock (fp);
|
|
if (_IO_seekpos_unlocked (fp, posp->__pos, _IOS_INPUT|_IOS_OUTPUT)
|
|
== _IO_pos_BAD)
|
|
{
|
|
/* ANSI explicitly requires setting errno to a positive value on
|
|
failure. */
|
|
if (errno == 0)
|
|
__set_errno (EIO);
|
|
result = EOF;
|
|
}
|
|
else
|
|
{
|
|
result = 0;
|
|
if (fp->_mode > 0
|
|
&& (*fp->_codecvt->__codecvt_do_encoding) (fp->_codecvt) < 0)
|
|
/* This is a stateful encoding, restore the state. */
|
|
fp->_wide_data->_IO_state = posp->__state;
|
|
}
|
|
_IO_release_lock (fp);
|
|
return result;
|
|
}
|
|
|
|
strong_alias (_IO_new_fsetpos, __new_fsetpos)
|
|
versioned_symbol (libc, _IO_new_fsetpos, _IO_fsetpos, GLIBC_2_2);
|
|
versioned_symbol (libc, __new_fsetpos, fsetpos, GLIBC_2_2);
|
|
|
|
#ifdef __OFF_T_MATCHES_OFF64_T
|
|
strong_alias (_IO_new_fsetpos, _IO_new_fsetpos64)
|
|
strong_alias (_IO_new_fsetpos64, __new_fsetpos64)
|
|
versioned_symbol (libc, __new_fsetpos64, fsetpos64, GLIBC_2_2);
|
|
versioned_symbol (libc, _IO_new_fsetpos64, _IO_fsetpos64, GLIBC_2_2);
|
|
#endif
|