From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: libc-alpha@sourceware.org, Paul Eggert <eggert@cs.ucla.edu>
Subject: [PATCH v5 6/7] misc: syslog: Move SYSLOG_NAME to USE_MISC (BZ #16355)
Date: Mon, 21 Mar 2022 18:19:12 -0300 [thread overview]
Message-ID: <20220321211913.2347924-7-adhemerval.zanella@linaro.org> (raw)
In-Reply-To: <20220321211913.2347924-1-adhemerval.zanella@linaro.org>
There is no easy solution as described on first comment in bug report,
and some code (like busybox) assumes facilitynames existance when
SYSLOG_NAMES is defined (so we can't just remove it as suggested in
comment #2).
So use the easier solution and guard it with __USE_MISC.
---
misc/sys/syslog.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/misc/sys/syslog.h b/misc/sys/syslog.h
index dc3b0e7ef8..d933fea104 100644
--- a/misc/sys/syslog.h
+++ b/misc/sys/syslog.h
@@ -62,7 +62,7 @@
#define LOG_PRI(p) ((p) & LOG_PRIMASK)
#define LOG_MAKEPRI(fac, pri) ((fac) | (pri))
-#ifdef SYSLOG_NAMES
+#if defined SYSLOG_NAMES && defined __USE_MISC
#define INTERNAL_NOPRI 0x10 /* the "no priority" priority */
/* mark "facility" */
#define INTERNAL_MARK LOG_MAKEPRI(LOG_NFACILITIES << 3, 0)
@@ -118,7 +118,7 @@ CODE prioritynames[] =
/* facility of pri */
#define LOG_FAC(p) (((p) & LOG_FACMASK) >> 3)
-#ifdef SYSLOG_NAMES
+#if defined SYSLOG_NAMES && defined __USE_MISC
CODE facilitynames[] =
{
{ "auth", LOG_AUTH },
--
2.32.0
next prev parent reply other threads:[~2022-03-21 21:19 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-21 21:19 [PATCH v5 0/7] Refactor syslog implementation Adhemerval Zanella
2022-03-21 21:19 ` [PATCH v5 1/7] support: Add xmkfifo Adhemerval Zanella
2022-03-21 21:19 ` [PATCH v5 2/7] misc: Add syslog test Adhemerval Zanella
2022-03-21 21:19 ` [PATCH v5 3/7] misc: syslog: Fix indentation and style Adhemerval Zanella
2022-03-21 21:19 ` [PATCH v5 4/7] misc: syslog: Simplify implementation Adhemerval Zanella
2022-03-21 21:19 ` [PATCH v5 5/7] misc: syslog: Use fixed-sized buffer and remove memstream Adhemerval Zanella
2022-03-21 21:19 ` Adhemerval Zanella [this message]
2022-03-21 21:19 ` [PATCH v5 7/7] misc: Use 64 bit time_t interfaces on syslog Adhemerval Zanella
[not found] ` <4c23c3a5-59fa-caa5-00d6-7392f6220b55@linaro.org>
[not found] ` <5780fdae-5b8e-e9ff-2e92-91343649a968@cs.ucla.edu>
[not found] ` <3ff164e7-c247-4275-a8d0-799c104b049e@linaro.org>
2022-04-14 22:12 ` [PATCH v5 0/7] Refactor syslog implementation Paul Eggert
2022-04-15 14:00 ` Adhemerval Zanella
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220321211913.2347924-7-adhemerval.zanella@linaro.org \
--to=adhemerval.zanella@linaro.org \
--cc=eggert@cs.ucla.edu \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).