From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from crab.elm.relay.mailchannels.net (crab.elm.relay.mailchannels.net [23.83.212.42]) by sourceware.org (Postfix) with ESMTPS id F0D18387606A for ; Fri, 30 Jun 2023 15:28:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org F0D18387606A Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=gotplt.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gotplt.org X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 492217617D2; Fri, 30 Jun 2023 15:28:37 +0000 (UTC) Received: from pdx1-sub0-mail-a286.dreamhost.com (unknown [127.0.0.6]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 523DF761CCF; Fri, 30 Jun 2023 15:28:36 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1688138916; a=rsa-sha256; cv=none; b=46YAXqkhnXGOyEFU+M6XBT68nNUcULvvMWeoWApqQot4NihEYCpLOnF3deFwlRzC8CWkYm wKTWHj+I+eC3D72HcSsmHS8m6YOFr+WeGowSQihwNCo2GIewE3bCcgtytySWJZmpGt02mM A2eO5iFcvd0764JRNinJj4WdDCVfHcID+T6JwLRC1thSW345Y2lMR5qhlLuM3v7cOg4HV7 YalHHJvX+NAcE1Z3Nj8ildqUV2ZJUTLb0aVLS4GwxRxIZsuxG9OamxY5LimoKXk4EA9Y6D Oj9zYsbSBaV0lxvOv2BZYXL1cXRAATNgd7nWlFFyCl+x+iUPHAhYHloGNVqCjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1688138916; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=rWWOCLleepwx3LTHSxaBpJO9kE9+JWe8C9KG1RHAi2Q=; b=inIHBVJr173VMzyDrQWN5lC/kyRgrKrfATM7mRaRlnn0GbZrQhsBbRcXy/WejLatljVwaf HXxuO4VPxGduqCieEK7NXxjNNL++d+eD4P0pxZWB5owgZOJfGOgKdaw5J5iblyvBHe0DxT NajcqLhHp/7SuoazndeoNDMnnweWyMllMpdoREG3eChWhSMokp4L9p1C72emarh8Hpvm0l 4YRobTNsdRIf0MTq/NBwdCb1GFkbhwAsxa8YMVBh8xYkfhg/XR8kLvNXkxe+10P0sW3pNs GDTX5rkJakAmmPnW2t5THO5hVDjG8BsbiD/dB+fYtuYVSmTZ/jTJ5zc90ZlYWA== ARC-Authentication-Results: i=1; rspamd-9fcc56855-gcssm; auth=pass smtp.auth=dreamhost smtp.mailfrom=siddhesh@gotplt.org X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org X-MC-Relay: Good X-MailChannels-SenderId: dreamhost|x-authsender|siddhesh@gotplt.org X-MailChannels-Auth-Id: dreamhost X-Fearful-Plucky: 6b09c8e937d8a332_1688138917068_629687750 X-MC-Loop-Signature: 1688138917068:265258551 X-MC-Ingress-Time: 1688138917068 Received: from pdx1-sub0-mail-a286.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.109.138.49 (trex/6.9.1); Fri, 30 Jun 2023 15:28:37 +0000 Received: from [192.168.0.182] (bras-vprn-toroon4834w-lp130-09-174-91-45-44.dsl.bell.ca [174.91.45.44]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: siddhesh@gotplt.org) by pdx1-sub0-mail-a286.dreamhost.com (Postfix) with ESMTPSA id 4Qszjv6rNgzn6; Fri, 30 Jun 2023 08:28:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gotplt.org; s=dreamhost; t=1688138916; bh=rWWOCLleepwx3LTHSxaBpJO9kE9+JWe8C9KG1RHAi2Q=; h=Date:Subject:To:From:Content-Type:Content-Transfer-Encoding; b=Lij2iUqtMZ1WcdEoJiaCMxoMKb94l3X044hx6B/ZnREdt/VcresLKPKl3ZsyK3cuB XSG32ItFYLwIm1iLtjViq+CaN5UVFIvBjj0sVVLgodh9wk0JGn6zuq9YdMS2AOBOsN P8aM78GkqvQNgcka0cn0o0IQaQtDSKC5mEClxjQmlWY3CqVX/tdCYDE45eJl2GWBd6 C3y8jSk6xmyt/PWFWWX/xZNUsPHwNmzi0c6A9srBUT+8VEFXOjc45CGRzyROCybYCz Suf/hnuYVNKh+iraf4dctAa4RdriMDVRLr37yR0zQwb+yTIi6VExK21+N0/InTIpeE M87SLk0PcAing== Message-ID: Date: Fri, 30 Jun 2023 11:28:34 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Subject: Re: [PATCH v3 12/16] misc/bits/syslog.h: Clearly separate declaration from definition Content-Language: en-US To: =?UTF-8?B?RnLDqWTDqXJpYyBCw6lyYXQ=?= , libc-alpha@sourceware.org References: <20230628084246.778302-1-fberat@redhat.com> <20230628084246.778302-13-fberat@redhat.com> From: Siddhesh Poyarekar In-Reply-To: <20230628084246.778302-13-fberat@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3037.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On 2023-06-28 04:42, Frédéric Bérat wrote: > 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. > --- LGTM. Reviewed-by: Siddhesh Poyarekar > include/bits/syslog-decl.h | 1 + > include/sys/syslog.h | 4 +++ > misc/Makefile | 1 + > misc/bits/syslog-decl.h | 35 +++++++++++++++++++ > misc/bits/syslog.h | 10 +----- > misc/syslog.c | 4 ++- > .../ldbl-128ibm-compat/ieee128-syslog.c | 1 + > 7 files changed, 46 insertions(+), 10 deletions(-) > create mode 100644 include/bits/syslog-decl.h > create mode 100644 misc/bits/syslog-decl.h > > diff --git a/include/bits/syslog-decl.h b/include/bits/syslog-decl.h > new file mode 100644 > index 0000000000..491a263777 > --- /dev/null > +++ b/include/bits/syslog-decl.h > @@ -0,0 +1 @@ > +#include > diff --git a/include/sys/syslog.h b/include/sys/syslog.h > index 44422eab13..1566228860 100644 > --- a/include/sys/syslog.h > +++ b/include/sys/syslog.h > @@ -3,6 +3,8 @@ > #include > #ifndef _ISOMAC > > +#include > + > libc_hidden_ldbl_proto (syslog) > > /* __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__ ((__format__ (__printf__, 2, 0))); > > +libc_hidden_ldbl_proto (__syslog_chk) > + > #endif /* _ISOMAC */ > #endif /* syslog.h */ > diff --git a/misc/Makefile b/misc/Makefile > index 3497d30f3b..fe0d49c1de 100644 > --- a/misc/Makefile > +++ b/misc/Makefile > @@ -64,6 +64,7 @@ headers := \ > sys/xattr.h \ > syslog.h \ > sys/syslog.h \ > + bits/syslog-decl.h \ > bits/syslog.h \ > bits/syslog-ldbl.h \ > bits/syslog-path.h \ > diff --git a/misc/bits/syslog-decl.h b/misc/bits/syslog-decl.h > new file mode 100644 > index 0000000000..a9349feee0 > --- /dev/null > +++ b/misc/bits/syslog-decl.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 > + . */ > + > +#ifndef _BITS_SYSLOG_DECL_H > +#define _BITS_SYSLOG_DECL_H 1 > + > +#ifndef _SYS_SYSLOG_H > +# error "Never include directly; use 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 > diff --git a/misc/bits/syslog.h b/misc/bits/syslog.h > index 305cac4ba0..d7de90ed14 100644 > --- a/misc/bits/syslog.h > +++ b/misc/bits/syslog.h > @@ -20,15 +20,7 @@ > # error "Never include directly; use 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 > +#include > > #include > #if defined __LDBL_COMPAT || __LDOUBLE_REDIRECTS_TO_FLOAT128_ABI == 1 > diff --git a/misc/syslog.c b/misc/syslog.c > index f67d4b58a4..1b8cb722c5 100644 > --- a/misc/syslog.c > +++ b/misc/syslog.c > @@ -101,7 +101,7 @@ __vsyslog (int pri, const char *fmt, va_list ap) > ldbl_weak_alias (__vsyslog, vsyslog) > > void > -__syslog_chk (int pri, int flag, const char *fmt, ...) > +___syslog_chk (int pri, int flag, const char *fmt, ...) > { > 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); > va_end (ap); > } > +ldbl_hidden_def (___syslog_chk, __syslog_chk) > +ldbl_strong_alias (___syslog_chk, __syslog_chk) > > void > __vsyslog_chk (int pri, int flag, const char *fmt, va_list ap) > diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-syslog.c b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-syslog.c > index 18aa7f707f..97810a7bbd 100644 > --- a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-syslog.c > +++ b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-syslog.c > @@ -52,6 +52,7 @@ ___ieee128___syslog_chk (int pri, int flag, const char *fmt, ...) > __vsyslog_internal (pri, fmt, ap, mode); > va_end (ap); > } > +hidden_def (___ieee128___syslog_chk) > strong_alias (___ieee128___syslog_chk, __syslog_chkieee128) > > void