mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
498afc54df
This patch cleans up following the obsoletion of _BSD_SOURCE and _SVID_SOURCE by combining __USE_BSD and __USE_SVID into __USE_MISC. The only non-mechanical part of this patch is the changes to features.h; everything else is simple substitution of __USE_MISC for the old macros. Thus, this patch leaves obviously redundant conditionals such as "defined __USE_MISC || defined __USE_MISC", and does not update #endif comments where they referred to BSD or SVID in words instead of the literal macro name. This is intended to facilitate patch review by separating the less mechanical changes from these purely mechanical changes into a separate patch. (I do intend to integrate all the changes from <https://sourceware.org/ml/libc-alpha/2013-12/msg00226.html>, which I believe includes all the trailing comment updates, in subsequent patches.) Tested x86_64. * include/features.h (__USE_BSD): Remove macro definitions. (__USE_SVID): Likewise. (_BSD_SOURCE): Likewise. (_SVID_SOURCE): Likewise. [!defined _BSD_SOURCE && !defined _SVID_SOURCE]: Remove condition from definition of _DEFAULT_SOURCE. [_BSD_SOURCE || _SVID_SOURCE]: Change condition to [_DEFAULT_SOURCE]. * bits/fcntl.h [__USE_BSD]: Change condition to [__USE_MISC]. * bits/mman.h [__USE_BSD]: Likewise. * bits/termios.h [__USE_BSD]: Likewise. * bits/waitstatus.h [__USE_BSD]: Likewise. * ctype/ctype.h [__USE_SVID]: Likewise. * dirent/dirent.h [__USE_BSD]: Likewise. * grp/grp.h [__USE_SVID]: Likewise. [__USE_BSD]: Likewise. * inet/netinet/igmp.h [__USE_BSD]: Likewise. * io/fcntl.h [__USE_BSD]: Likewise. * io/ftw.h [__USE_BSD]: Likewise. * io/sys/stat.h [__USE_BSD]: Likewise. * libio/bits/stdio-ldbl.h [__USE_BSD]: Likewise. * libio/bits/stdio2.h [__USE_BSD]: Likewise. * libio/stdio.h [__USE_SVID]: Likewise. [__USE_BSD]: Likewise. * math/math.h [__USE_SVID]: Likewise. [__USE_BSD]: Likewise. * misc/bits/syslog-ldbl.h [__USE_BSD]: Likewise. * misc/bits/syslog.h [__USE_BSD]: Likewise. * misc/search.h [__USE_SVID]: Likewise. * misc/sys/mman.h [__USE_BSD]: Likewise. * misc/sys/syslog.h [__USE_BSD]: Likewise. * misc/sys/uio.h [__USE_BSD]: Likewise. * posix/bits/unistd.h [__USE_BSD]: Likewise. * posix/glob.h [__USE_BSD]: Likewise. * posix/regex.h [__USE_BSD]: Likewise. * posix/sys/types.h [__USE_BSD]: Likewise. [__USE_SVID]: Likewise. * posix/sys/utsname.h [__USE_SVID]: Likewise. * posix/sys/wait.h [__USE_BSD]: Likewise. [__USE_SVID]: Likewise. * posix/unistd.h [__USE_BSD]: Likewise. [__USE_SVID]: Likewise. * pwd/pwd.h [__USE_SVID]: Likewise. * resolv/netdb.h [__USE_BSD]: Likewise. * setjmp/setjmp.h [__USE_BSD]: Likewise. * signal/signal.h [__USE_BSD]: Likewise. [__USE_SVID]: Likewise. * socket/sys/socket.h [__USE_BSD]: Likewise. * stdlib/fmtmsg.h [__USE_SVID]: Likewise. * stdlib/stdlib.h [__USE_BSD]: Likewise. [__USE_SVID]: Likewise. * string/bits/string2.h [__USE_BSD]: Likewise. [__USE_SVID]: Likewise. * string/bits/string3.h [__USE_BSD]: Likewise. * string/endian.h [__USE_BSD]: Likewise. * string/string.h [__USE_SVID]: Likewise. [__USE_BSD]: Likewise. * string/strings.h [__USE_BSD]: Likewise. * sysdeps/generic/netinet/ip.h [__USE_BSD]: Likewise. * sysdeps/gnu/netinet/ip_icmp.h [__USE_BSD]: Likewise. * sysdeps/mach/hurd/bits/fcntl.h [__USE_BSD]: Likewise. * sysdeps/mach/hurd/bits/stat.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/mman.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/termios.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/bits/fcntl-linux.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/bits/mman-linux.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/bits/sys_errlist.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/bits/termios.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/mips/bits/termios.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/netinet/if_ether.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/netinet/if_fddi.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/netinet/if_tr.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/powerpc/bits/termios.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/termios.h [__USE_BSD]: Likewise. * sysdeps/x86/bits/string.h [__USE_BSD]: Likewise. * sysvipc/sys/ipc.h [__USE_SVID]: Likewise. * termios/termios.h [__USE_BSD]: Likewise. * time/sys/time.h [__USE_BSD]: Likewise. * time/time.h [__USE_BSD]: Likewise. [__USE_SVID]: Likewise. * sysdeps/unix/sysv/linux/hppa/bits/mman.h [__USE_BSD]: Change condition to [__USE_MISC].
106 lines
3.2 KiB
C
106 lines
3.2 KiB
C
/* Message display handling.
|
|
Copyright (C) 1997-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 __FMTMSG_H
|
|
#define __FMTMSG_H 1
|
|
|
|
#include <features.h>
|
|
|
|
|
|
__BEGIN_DECLS
|
|
|
|
/* Values to control `fmtmsg' function. */
|
|
enum
|
|
{
|
|
MM_HARD = 0x001, /* Source of the condition is hardware. */
|
|
#define MM_HARD MM_HARD
|
|
MM_SOFT = 0x002, /* Source of the condition is software. */
|
|
#define MM_SOFT MM_SOFT
|
|
MM_FIRM = 0x004, /* Source of the condition is firmware. */
|
|
#define MM_FIRM MM_FIRM
|
|
MM_APPL = 0x008, /* Condition detected by application. */
|
|
#define MM_APPL MM_APPL
|
|
MM_UTIL = 0x010, /* Condition detected by utility. */
|
|
#define MM_UTIL MM_UTIL
|
|
MM_OPSYS = 0x020, /* Condition detected by operating system. */
|
|
#define MM_OPSYS MM_OPSYS
|
|
MM_RECOVER = 0x040, /* Recoverable error. */
|
|
#define MM_RECOVER MM_RECOVER
|
|
MM_NRECOV = 0x080, /* Non-recoverable error. */
|
|
#define MM_NRECOV MM_NRECOV
|
|
MM_PRINT = 0x100, /* Display message in standard error. */
|
|
#define MM_PRINT MM_PRINT
|
|
MM_CONSOLE = 0x200 /* Display message on system console. */
|
|
#define MM_CONSOLE MM_CONSOLE
|
|
};
|
|
|
|
/* Values to be for SEVERITY parameter of `fmtmsg'. */
|
|
enum
|
|
{
|
|
MM_NOSEV = 0, /* No severity level provided for the message. */
|
|
#define MM_NOSEV MM_NOSEV
|
|
MM_HALT, /* Error causing application to halt. */
|
|
#define MM_HALT MM_HALT
|
|
MM_ERROR, /* Application has encountered a non-fatal fault. */
|
|
#define MM_ERROR MM_ERROR
|
|
MM_WARNING, /* Application has detected unusual non-error
|
|
condition. */
|
|
#define MM_WARNING MM_WARNING
|
|
MM_INFO /* Informative message. */
|
|
#define MM_INFO MM_INFO
|
|
};
|
|
|
|
|
|
/* Macros which can be used as null values for the arguments of `fmtmsg'. */
|
|
#define MM_NULLLBL ((char *) 0)
|
|
#define MM_NULLSEV 0
|
|
#define MM_NULLMC ((long int) 0)
|
|
#define MM_NULLTXT ((char *) 0)
|
|
#define MM_NULLACT ((char *) 0)
|
|
#define MM_NULLTAG ((char *) 0)
|
|
|
|
|
|
/* Possible return values of `fmtmsg'. */
|
|
enum
|
|
{
|
|
MM_NOTOK = -1,
|
|
#define MM_NOTOK MM_NOTOK
|
|
MM_OK = 0,
|
|
#define MM_OK MM_OK
|
|
MM_NOMSG = 1,
|
|
#define MM_NOMSG MM_NOMSG
|
|
MM_NOCON = 4
|
|
#define MM_NOCON MM_NOCON
|
|
};
|
|
|
|
|
|
/* Print message with given CLASSIFICATION, LABEL, SEVERITY, TEXT, ACTION
|
|
and TAG to console or standard error. */
|
|
extern int fmtmsg (long int __classification, const char *__label,
|
|
int __severity, const char *__text,
|
|
const char *__action, const char *__tag);
|
|
|
|
#ifdef __USE_MISC
|
|
/* Add or remove severity level. */
|
|
extern int addseverity (int __severity, const char *__string) __THROW;
|
|
#endif
|
|
|
|
__END_DECLS
|
|
|
|
#endif /* fmtmsg.h */
|