mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-23 13: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.
112 lines
3.5 KiB
C
112 lines
3.5 KiB
C
/* Thread package specific definitions of stream lock type. NPTL version.
|
|
Copyright (C) 2000-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/>. */
|
|
|
|
#ifndef _STDIO_LOCK_H
|
|
#define _STDIO_LOCK_H 1
|
|
|
|
#include <libc-lock.h>
|
|
#include <lowlevellock.h>
|
|
|
|
|
|
/* The locking here is very inexpensive, even for inlining. */
|
|
#define _IO_lock_inexpensive 1
|
|
|
|
typedef struct { int lock; int cnt; void *owner; } _IO_lock_t;
|
|
#define _IO_lock_t_defined 1
|
|
|
|
#define _IO_lock_initializer { LLL_LOCK_INITIALIZER, 0, NULL }
|
|
|
|
#define _IO_lock_init(_name) \
|
|
((void) ((_name) = (_IO_lock_t) _IO_lock_initializer))
|
|
|
|
#define _IO_lock_fini(_name) \
|
|
((void) 0)
|
|
|
|
#define _IO_lock_lock(_name) \
|
|
do { \
|
|
void *__self = THREAD_SELF; \
|
|
if ((_name).owner != __self) \
|
|
{ \
|
|
lll_lock ((_name).lock, LLL_PRIVATE); \
|
|
(_name).owner = __self; \
|
|
} \
|
|
++(_name).cnt; \
|
|
} while (0)
|
|
|
|
#define _IO_lock_trylock(_name) \
|
|
({ \
|
|
int __result = 0; \
|
|
void *__self = THREAD_SELF; \
|
|
if ((_name).owner != __self) \
|
|
{ \
|
|
if (lll_trylock ((_name).lock) == 0) \
|
|
{ \
|
|
(_name).owner = __self; \
|
|
(_name).cnt = 1; \
|
|
} \
|
|
else \
|
|
__result = EBUSY; \
|
|
} \
|
|
else \
|
|
++(_name).cnt; \
|
|
__result; \
|
|
})
|
|
|
|
#define _IO_lock_unlock(_name) \
|
|
do { \
|
|
if (--(_name).cnt == 0) \
|
|
{ \
|
|
(_name).owner = NULL; \
|
|
lll_unlock ((_name).lock, LLL_PRIVATE); \
|
|
} \
|
|
} while (0)
|
|
|
|
|
|
|
|
#define _IO_cleanup_region_start(_fct, _fp) \
|
|
__libc_cleanup_region_start (((_fp)->_flags & _IO_USER_LOCK) == 0, _fct, _fp)
|
|
#define _IO_cleanup_region_start_noarg(_fct) \
|
|
__libc_cleanup_region_start (1, _fct, NULL)
|
|
#define _IO_cleanup_region_end(_doit) \
|
|
__libc_cleanup_region_end (_doit)
|
|
|
|
#if defined _LIBC && IS_IN (libc)
|
|
|
|
# ifdef __EXCEPTIONS
|
|
# define _IO_acquire_lock(_fp) \
|
|
do { \
|
|
FILE *_IO_acquire_lock_file \
|
|
__attribute__((cleanup (_IO_acquire_lock_fct))) \
|
|
= (_fp); \
|
|
_IO_flockfile (_IO_acquire_lock_file);
|
|
# define _IO_acquire_lock_clear_flags2(_fp) \
|
|
do { \
|
|
FILE *_IO_acquire_lock_file \
|
|
__attribute__((cleanup (_IO_acquire_lock_clear_flags2_fct))) \
|
|
= (_fp); \
|
|
_IO_flockfile (_IO_acquire_lock_file);
|
|
# else
|
|
# define _IO_acquire_lock(_fp) _IO_acquire_lock_needs_exceptions_enabled
|
|
# define _IO_acquire_lock_clear_flags2(_fp) _IO_acquire_lock (_fp)
|
|
# endif
|
|
# define _IO_release_lock(_fp) ; } while (0)
|
|
|
|
#endif
|
|
|
|
#endif /* stdio-lock.h */
|