public inbox for libc-alpha@sourceware.org
 help / color / mirror / Atom feed
From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: libc-alpha@sourceware.org
Subject: [PATCH v2 6/7] misc: syslog: Move SYSLOG_NAME to USE_MISC (BZ #16355)
Date: Fri, 18 Feb 2022 11:23:21 -0300	[thread overview]
Message-ID: <20220218142322.432304-7-adhemerval.zanella@linaro.org> (raw)
In-Reply-To: <20220218142322.432304-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..bf368d1b8d 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


  parent reply	other threads:[~2022-02-18 14:23 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-18 14:23 [PATCH v2 0/7] Use RFC5424 for syslog Adhemerval Zanella
2022-02-18 14:23 ` [PATCH v2 1/7] support: Add xmkfifo Adhemerval Zanella
2022-02-18 14:23 ` [PATCH v2 2/7] misc: Add syslog test Adhemerval Zanella
2022-02-18 14:23 ` [PATCH v2 3/7] misc: syslog: Fix indentation and style Adhemerval Zanella
2022-02-18 14:23 ` [PATCH v2 4/7] misc: syslog: Simplify implementation Adhemerval Zanella
2022-02-19  3:15   ` Paul Eggert
2022-02-21 13:15     ` Adhemerval Zanella
2022-02-21 22:25       ` Paul Eggert
2022-02-21 14:06     ` Andreas Schwab
2022-02-21 22:23       ` Paul Eggert
2022-02-18 14:23 ` [PATCH v2 5/7] misc: syslog: Use static buffer Adhemerval Zanella
2022-02-19  3:45   ` Paul Eggert
2022-02-21 13:31     ` Adhemerval Zanella
2022-02-18 14:23 ` Adhemerval Zanella [this message]
2022-02-18 14:23 ` [PATCH v2 7/7] misc: syslog: Use RFC5424 Adhemerval Zanella
2022-02-19  3:50   ` Paul Eggert
2022-02-21 14:01     ` Adhemerval Zanella
2022-02-21 16:18       ` Adhemerval Zanella
2022-02-21 22:25         ` Paul Eggert
2022-02-19 20:35   ` Dan Raymond
2022-02-19 22:23     ` Paul Eggert

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=20220218142322.432304-7-adhemerval.zanella@linaro.org \
    --to=adhemerval.zanella@linaro.org \
    --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).