mirror of git://sourceware.org/git/glibc.git
misc/bits/syslog.h: Clearly separate declaration from definition
This allows to include bits/syslog-decl.h in include/sys/syslog.h and therefore be able to create the libc_hidden_builtin_proto (__syslog_chk) prototype. Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
This commit is contained in:
parent
d9a99272d2
commit
ba745eff46
|
@ -0,0 +1 @@
|
||||||
|
#include <misc/bits/syslog-decl.h>
|
|
@ -3,6 +3,8 @@
|
||||||
#include <misc/sys/syslog.h>
|
#include <misc/sys/syslog.h>
|
||||||
#ifndef _ISOMAC
|
#ifndef _ISOMAC
|
||||||
|
|
||||||
|
#include <bits/syslog-decl.h>
|
||||||
|
|
||||||
libc_hidden_ldbl_proto (syslog)
|
libc_hidden_ldbl_proto (syslog)
|
||||||
|
|
||||||
/* __vsyslog_internal uses the same mode_flags bits as
|
/* __vsyslog_internal uses the same mode_flags bits as
|
||||||
|
@ -12,5 +14,7 @@ extern void __vsyslog_internal (int pri, const char *fmt, __gnuc_va_list ap,
|
||||||
attribute_hidden
|
attribute_hidden
|
||||||
__attribute__ ((__format__ (__printf__, 2, 0)));
|
__attribute__ ((__format__ (__printf__, 2, 0)));
|
||||||
|
|
||||||
|
libc_hidden_ldbl_proto (__syslog_chk)
|
||||||
|
|
||||||
#endif /* _ISOMAC */
|
#endif /* _ISOMAC */
|
||||||
#endif /* syslog.h */
|
#endif /* syslog.h */
|
||||||
|
|
|
@ -64,6 +64,7 @@ headers := \
|
||||||
sys/xattr.h \
|
sys/xattr.h \
|
||||||
syslog.h \
|
syslog.h \
|
||||||
sys/syslog.h \
|
sys/syslog.h \
|
||||||
|
bits/syslog-decl.h \
|
||||||
bits/syslog.h \
|
bits/syslog.h \
|
||||||
bits/syslog-ldbl.h \
|
bits/syslog-ldbl.h \
|
||||||
bits/syslog-path.h \
|
bits/syslog-path.h \
|
||||||
|
|
|
@ -0,0 +1,35 @@
|
||||||
|
/* Checking routines for syslog functions. Declaration only.
|
||||||
|
Copyright (C) 2023 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
|
||||||
|
<https://www.gnu.org/licenses/>. */
|
||||||
|
|
||||||
|
#ifndef _BITS_SYSLOG_DECL_H
|
||||||
|
#define _BITS_SYSLOG_DECL_H 1
|
||||||
|
|
||||||
|
#ifndef _SYS_SYSLOG_H
|
||||||
|
# error "Never include <bits/syslog-decl.h> directly; use <sys/syslog.h> instead."
|
||||||
|
#endif
|
||||||
|
|
||||||
|
extern void __syslog_chk (int __pri, int __flag, const char *__fmt, ...)
|
||||||
|
__attribute__ ((__format__ (__printf__, 3, 4)));
|
||||||
|
|
||||||
|
#ifdef __USE_MISC
|
||||||
|
extern void __vsyslog_chk (int __pri, int __flag, const char *__fmt,
|
||||||
|
__gnuc_va_list __ap)
|
||||||
|
__attribute__ ((__format__ (__printf__, 3, 0)));
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif
|
|
@ -20,15 +20,7 @@
|
||||||
# error "Never include <bits/syslog.h> directly; use <sys/syslog.h> instead."
|
# error "Never include <bits/syslog.h> directly; use <sys/syslog.h> instead."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include <bits/syslog-decl.h>
|
||||||
extern void __syslog_chk (int __pri, int __flag, const char *__fmt, ...)
|
|
||||||
__attribute__ ((__format__ (__printf__, 3, 4)));
|
|
||||||
|
|
||||||
#ifdef __USE_MISC
|
|
||||||
extern void __vsyslog_chk (int __pri, int __flag, const char *__fmt,
|
|
||||||
__gnuc_va_list __ap)
|
|
||||||
__attribute__ ((__format__ (__printf__, 3, 0)));
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <bits/floatn.h>
|
#include <bits/floatn.h>
|
||||||
#if defined __LDBL_COMPAT || __LDOUBLE_REDIRECTS_TO_FLOAT128_ABI == 1
|
#if defined __LDBL_COMPAT || __LDOUBLE_REDIRECTS_TO_FLOAT128_ABI == 1
|
||||||
|
|
|
@ -101,7 +101,7 @@ __vsyslog (int pri, const char *fmt, va_list ap)
|
||||||
ldbl_weak_alias (__vsyslog, vsyslog)
|
ldbl_weak_alias (__vsyslog, vsyslog)
|
||||||
|
|
||||||
void
|
void
|
||||||
__syslog_chk (int pri, int flag, const char *fmt, ...)
|
___syslog_chk (int pri, int flag, const char *fmt, ...)
|
||||||
{
|
{
|
||||||
va_list ap;
|
va_list ap;
|
||||||
|
|
||||||
|
@ -109,6 +109,8 @@ __syslog_chk (int pri, int flag, const char *fmt, ...)
|
||||||
__vsyslog_internal (pri, fmt, ap, (flag > 0) ? PRINTF_FORTIFY : 0);
|
__vsyslog_internal (pri, fmt, ap, (flag > 0) ? PRINTF_FORTIFY : 0);
|
||||||
va_end (ap);
|
va_end (ap);
|
||||||
}
|
}
|
||||||
|
ldbl_hidden_def (___syslog_chk, __syslog_chk)
|
||||||
|
ldbl_strong_alias (___syslog_chk, __syslog_chk)
|
||||||
|
|
||||||
void
|
void
|
||||||
__vsyslog_chk (int pri, int flag, const char *fmt, va_list ap)
|
__vsyslog_chk (int pri, int flag, const char *fmt, va_list ap)
|
||||||
|
|
|
@ -52,6 +52,7 @@ ___ieee128___syslog_chk (int pri, int flag, const char *fmt, ...)
|
||||||
__vsyslog_internal (pri, fmt, ap, mode);
|
__vsyslog_internal (pri, fmt, ap, mode);
|
||||||
va_end (ap);
|
va_end (ap);
|
||||||
}
|
}
|
||||||
|
hidden_def (___ieee128___syslog_chk)
|
||||||
strong_alias (___ieee128___syslog_chk, __syslog_chkieee128)
|
strong_alias (___ieee128___syslog_chk, __syslog_chkieee128)
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
Loading…
Reference in New Issue