mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-27 15:30:07 +00:00
acd7f096d7
This patch completes the headers cleanup consequent on removal of _BSD_SOURCE and _SVID_SOURCE (apart from any subsequent deprecations): * #endif conditionals that referred to BSD or SVID are updated. * Redundant __USE_* tests in cases involving __USE_MISC are removed. This includes cases such as __USE_MISC || __USE_ISOC99, where __USE_MISC is redundant (because __USE_MISC is only ever defined in the default / _DEFAULT_SOURCE / _GNU_SOURCE case, when __USE_ISOC99 is also defined; the same applies to the non-XSI-extended POSIX versions), and cases involving __USE_GNU, where __USE_GNU is redundant (because if __USE_GNU is defined, so are the other __USE_* macros). There may well be other cases of __USE_FOO || __USE_BAR tests that could be simplified because one macro implies the other; this patch only addresses cases involving __USE_MISC. Tested x86_64. * bits/fcntl.h [__USE_MISC]: Remove redundant conditionals. * bits/sigaction.h [__USE_MISC]: Likewise. * bits/waitstatus.h: Update #endif comments. * ctype/ctype.h: Likewise. * dirent/dirent.h: Likewise. [__USE_MISC]: Remove redundant conditionals. * grp/grp.h: Update #endif comments. [__USE_GNU]: Remove redundant conditionals. [__USE_MISC]: Likewise. * inet/netinet/in.h [__USE_GNU]: Likewise. * io/sys/stat.h [__USE_MISC]: Likewise. * libio/bits/stdio-ldbl.h [__USE_MISC]: Likewise. * libio/bits/stdio.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * libio/bits/stdio2.h [__USE_MISC]: Likewise. * libio/stdio.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * math/bits/math-finite.h [__USE_MISC]: Likewise. * math/bits/mathcalls.h [__USE_MISC]: Likewise. * math/math.h: Update #else and #endif comments. [__USE_MISC]: Remove redundant conditionals. * misc/sys/uio.h: Update #endif comments. * posix/bits/unistd.h [__USE_MISC]: Remove redundant conditionals. * posix/glob.h [__USE_MISC]: Likewise. * posix/sys/types.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * posix/sys/wait.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * posix/unistd.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * pwd/pwd.h [__USE_GNU]: Likewise. [__USE_MISC]: Likewise. * resolv/netdb.h [__USE_GNU]: Likewise. * signal/signal.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * stdlib/stdlib.h: Update #else and #endif comments. [__USE_MISC]: Remove redundant conditionals. [__USE_GNU]: Likewise. * string/bits/string2.h [__USE_MISC]: Likewise. * string/string.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * sysdeps/m68k/m680x0/fpu/bits/mathinline.h [__USE_MISC]: Likewise. * sysdeps/mach/hurd/bits/fcntl.h [__USE_MISC]: Likewise. * sysdeps/mach/hurd/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/bits/fcntl-linux.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * sysdeps/unix/sysv/linux/bits/in.h [__USE_GNU]: Likewise. * sysdeps/unix/sysv/linux/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/bits/socket.h [__USE_GNU]: Likewise. * sysdeps/unix/sysv/linux/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/ia64/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/m68k/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/mips/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/mips/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/powerpc/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/s390/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/s390/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/x86/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/x86/bits/string.h: Update #endif comments. * sysdeps/x86/fpu/bits/mathinline.h [__USE_MISC]: Remove redundant conditionals. * time/sys/time.h: Update #endif comments. * time/time.h: Likewise. [__USE_MISC]: Remove redundant conditionals.
191 lines
5.4 KiB
C
191 lines
5.4 KiB
C
/* Optimizing macros and inline functions for stdio functions.
|
|
Copyright (C) 1998-2014 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_H
|
|
# error "Never include <bits/stdio.h> directly; use <stdio.h> instead."
|
|
#endif
|
|
|
|
#ifndef __extern_inline
|
|
# define __STDIO_INLINE inline
|
|
#else
|
|
# define __STDIO_INLINE __extern_inline
|
|
#endif
|
|
|
|
|
|
#ifdef __USE_EXTERN_INLINES
|
|
/* For -D_FORTIFY_SOURCE{,=2} bits/stdio2.h will define a different
|
|
inline. */
|
|
# if !(__USE_FORTIFY_LEVEL > 0 && defined __fortify_function)
|
|
/* Write formatted output to stdout from argument list ARG. */
|
|
__STDIO_INLINE int
|
|
vprintf (const char *__restrict __fmt, _G_va_list __arg)
|
|
{
|
|
return vfprintf (stdout, __fmt, __arg);
|
|
}
|
|
# endif
|
|
|
|
/* Read a character from stdin. */
|
|
__STDIO_INLINE int
|
|
getchar (void)
|
|
{
|
|
return _IO_getc (stdin);
|
|
}
|
|
|
|
|
|
# ifdef __USE_MISC
|
|
/* Faster version when locking is not necessary. */
|
|
__STDIO_INLINE int
|
|
fgetc_unlocked (FILE *__fp)
|
|
{
|
|
return _IO_getc_unlocked (__fp);
|
|
}
|
|
# endif /* misc */
|
|
|
|
|
|
# ifdef __USE_POSIX
|
|
/* This is defined in POSIX.1:1996. */
|
|
__STDIO_INLINE int
|
|
getc_unlocked (FILE *__fp)
|
|
{
|
|
return _IO_getc_unlocked (__fp);
|
|
}
|
|
|
|
/* This is defined in POSIX.1:1996. */
|
|
__STDIO_INLINE int
|
|
getchar_unlocked (void)
|
|
{
|
|
return _IO_getc_unlocked (stdin);
|
|
}
|
|
# endif /* POSIX */
|
|
|
|
|
|
/* Write a character to stdout. */
|
|
__STDIO_INLINE int
|
|
putchar (int __c)
|
|
{
|
|
return _IO_putc (__c, stdout);
|
|
}
|
|
|
|
|
|
# ifdef __USE_MISC
|
|
/* Faster version when locking is not necessary. */
|
|
__STDIO_INLINE int
|
|
fputc_unlocked (int __c, FILE *__stream)
|
|
{
|
|
return _IO_putc_unlocked (__c, __stream);
|
|
}
|
|
# endif /* misc */
|
|
|
|
|
|
# ifdef __USE_POSIX
|
|
/* This is defined in POSIX.1:1996. */
|
|
__STDIO_INLINE int
|
|
putc_unlocked (int __c, FILE *__stream)
|
|
{
|
|
return _IO_putc_unlocked (__c, __stream);
|
|
}
|
|
|
|
/* This is defined in POSIX.1:1996. */
|
|
__STDIO_INLINE int
|
|
putchar_unlocked (int __c)
|
|
{
|
|
return _IO_putc_unlocked (__c, stdout);
|
|
}
|
|
# endif /* POSIX */
|
|
|
|
|
|
# ifdef __USE_GNU
|
|
/* Like `getdelim', but reads up to a newline. */
|
|
__STDIO_INLINE _IO_ssize_t
|
|
getline (char **__lineptr, size_t *__n, FILE *__stream)
|
|
{
|
|
return __getdelim (__lineptr, __n, '\n', __stream);
|
|
}
|
|
# endif /* GNU */
|
|
|
|
|
|
# ifdef __USE_MISC
|
|
/* Faster versions when locking is not required. */
|
|
__STDIO_INLINE int
|
|
__NTH (feof_unlocked (FILE *__stream))
|
|
{
|
|
return _IO_feof_unlocked (__stream);
|
|
}
|
|
|
|
/* Faster versions when locking is not required. */
|
|
__STDIO_INLINE int
|
|
__NTH (ferror_unlocked (FILE *__stream))
|
|
{
|
|
return _IO_ferror_unlocked (__stream);
|
|
}
|
|
# endif /* misc */
|
|
|
|
#endif /* Use extern inlines. */
|
|
|
|
|
|
#if defined __USE_MISC && defined __GNUC__ && defined __OPTIMIZE__ \
|
|
&& !defined __cplusplus
|
|
/* Perform some simple optimizations. */
|
|
# define fread_unlocked(ptr, size, n, stream) \
|
|
(__extension__ ((__builtin_constant_p (size) && __builtin_constant_p (n) \
|
|
&& (size_t) (size) * (size_t) (n) <= 8 \
|
|
&& (size_t) (size) != 0) \
|
|
? ({ char *__ptr = (char *) (ptr); \
|
|
FILE *__stream = (stream); \
|
|
size_t __cnt; \
|
|
for (__cnt = (size_t) (size) * (size_t) (n); \
|
|
__cnt > 0; --__cnt) \
|
|
{ \
|
|
int __c = _IO_getc_unlocked (__stream); \
|
|
if (__c == EOF) \
|
|
break; \
|
|
*__ptr++ = __c; \
|
|
} \
|
|
((size_t) (size) * (size_t) (n) - __cnt) \
|
|
/ (size_t) (size); }) \
|
|
: (((__builtin_constant_p (size) && (size_t) (size) == 0) \
|
|
|| (__builtin_constant_p (n) && (size_t) (n) == 0)) \
|
|
/* Evaluate all parameters once. */ \
|
|
? ((void) (ptr), (void) (stream), (void) (size), \
|
|
(void) (n), (size_t) 0) \
|
|
: fread_unlocked (ptr, size, n, stream))))
|
|
|
|
# define fwrite_unlocked(ptr, size, n, stream) \
|
|
(__extension__ ((__builtin_constant_p (size) && __builtin_constant_p (n) \
|
|
&& (size_t) (size) * (size_t) (n) <= 8 \
|
|
&& (size_t) (size) != 0) \
|
|
? ({ const char *__ptr = (const char *) (ptr); \
|
|
FILE *__stream = (stream); \
|
|
size_t __cnt; \
|
|
for (__cnt = (size_t) (size) * (size_t) (n); \
|
|
__cnt > 0; --__cnt) \
|
|
if (_IO_putc_unlocked (*__ptr++, __stream) == EOF) \
|
|
break; \
|
|
((size_t) (size) * (size_t) (n) - __cnt) \
|
|
/ (size_t) (size); }) \
|
|
: (((__builtin_constant_p (size) && (size_t) (size) == 0) \
|
|
|| (__builtin_constant_p (n) && (size_t) (n) == 0)) \
|
|
/* Evaluate all parameters once. */ \
|
|
? ((void) (ptr), (void) (stream), (void) (size), \
|
|
(void) (n), (size_t) 0) \
|
|
: fwrite_unlocked (ptr, size, n, stream))))
|
|
#endif
|
|
|
|
/* Define helper macro. */
|
|
#undef __STDIO_INLINE
|