From patchwork Mon Apr 12 21:11:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 42959 X-Patchwork-Delegate: carlos@redhat.com Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E20E73A07014; Mon, 12 Apr 2021 21:11:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E20E73A07014 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1618261891; bh=xG/BwDLS0vr/gjRM6mfHPTM8qGoJ0qZGRQRQvUTpUOc=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=gGoocEhWZh/Sy0XsIp/EiyUFAjxLJCZFtRwUel7YMZi53iVdxDYXkOCfZswAQNoVf 5syGR7/rbf+X6oF63Ac7BH2WWY9WCZUqtDSlhVSWi5Tqu1ZXVVwFLZEX6oWuSPQhWa EC/rRL2btttqo8vedYs5/rYAcYElnjs8OlwuKz98= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qt1-x82f.google.com (mail-qt1-x82f.google.com [IPv6:2607:f8b0:4864:20::82f]) by sourceware.org (Postfix) with ESMTPS id 9B7083982070 for ; Mon, 12 Apr 2021 21:11:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 9B7083982070 Received: by mail-qt1-x82f.google.com with SMTP id c6so11119014qtc.1 for ; Mon, 12 Apr 2021 14:11:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xG/BwDLS0vr/gjRM6mfHPTM8qGoJ0qZGRQRQvUTpUOc=; b=YlwA4Gxn/kz6IJYmhpS9yJRK3hVemoyhHe2csmVpT5JK0WiSIORrq0kpZp5Yv8cn4n Q+V4ivH2FSBOAMINinnWLfIlDuWGP+JCx6AZzIAuEK/WBc9xTE2YfOzkHkgEXYDYCblm E5ksixr9/IoLi+woewc42iFWIai/Rp+OJl9Iwovudamx4FIkAezYmtb2kymazdvqw3T9 Hux3E2VfqYWF5y1YOE/BFVvX+5ga4wm1kp2oH40KLfd3BHQcS2aLdjcDJhtSCkkUjSC7 zujHOcOt6vK+DUVpLJ2XdHVDflWfHnmrTeENzhZEd9ja8Um09Fdt5X4oEyTR15pxCLbS C3FQ== X-Gm-Message-State: AOAM533i+FV80sPijXr1jA00om6L+bvTntrR8I8STXfwA5gAR9QVb9Ap Ua7Zoru4SKixF7f+2tlApjXAz4ArwCEbOzhX X-Google-Smtp-Source: ABdhPJx6iI1WN3yQksDGOki3rpSXyyWMG1TCMOcUGAQNGQotVikWqO9ZouyJevtqttr4ayQrz+KHEQ== X-Received: by 2002:ac8:7747:: with SMTP id g7mr27165310qtu.144.1618261888092; Mon, 12 Apr 2021 14:11:28 -0700 (PDT) Received: from localhost.localdomain ([177.194.41.149]) by smtp.googlemail.com with ESMTPSA id i22sm3073392qko.135.2021.04.12.14.11.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Apr 2021 14:11:27 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH 10/11] misc: syslog: Move SYSLOG_NAME to USE_MISC (BZ #16355) Date: Mon, 12 Apr 2021 18:11:12 -0300 Message-Id: <20210412211113.393120-10-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210412211113.393120-1-adhemerval.zanella@linaro.org> References: <20210412211113.393120-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" 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 },