From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from bee.birch.relay.mailchannels.net (bee.birch.relay.mailchannels.net [23.83.209.14]) by sourceware.org (Postfix) with ESMTPS id 90C4A3858D33 for ; Mon, 2 Oct 2023 14:11:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 90C4A3858D33 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 F3583941963; Mon, 2 Oct 2023 14:11:25 +0000 (UTC) Received: from pdx1-sub0-mail-a272.dreamhost.com (unknown [127.0.0.6]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 7315A9418D5; Mon, 2 Oct 2023 14:11:25 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1696255885; a=rsa-sha256; cv=none; b=oe5yGzvLxel6bKvsIlFaNzinan4yQridEs811dsQPcMDV55LcPHwH+t8pe5b7VDJYuQCCl pO/Ywz7Vkuh9VaGm+h2+dP3TMAhPzEUOBIuUt/05z/OVj385lw/zQKOLBZP1tEFurq6tc9 NzbvbQI3PKgdFvSyVjkjGgxbIomzhvCDc5dl7conA9IiKCSl5jSI8zvHbpxYHRXSkkZDay 54Ts/tfENIGu9yXAg692QZkj/j1NP7mHV0/s3GgiycUAr/ZTHY7+OqTX6qGvJPkqK4rU0A 9qPTjT8h1ySXSZ4Ztcxvg3sagrwICMEWTxlqOyF8ehp13Unpg8fzGKzDjQRDbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1696255885; 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=8j+VUt2OWnC4VHzROu2vgTCSkhB63YbW7djVZckRH44=; b=NdMpLBnDIUdwB9Q0ExVRB+kFAKeRH/dxbklu9bqg552KIv0DxjSKFJFt7uh/uhWOgPYzyE JAAvlUzZg9XOGoSm96WrfYoxeNeD40D9xgrBI9ttOm42YUBdm65LVsbiIQFtDRI2KZPl4X oEwWCEACNnuRQ+u0dIlzA6BYuLwMNz+C0x2KVAAzKsI5gYErlvEp8f3dBsugWxr4kmqHra K9ye9HZWvdB6rKdr3supHrdVHaGzb9F+WdVrq2aG2oQL3NsckZITPWrcXn+0QwtD7a08Rc 78X4CH7t0WlohxtYyzaHD/WWQ1w5tAaN1pMycDbYeFhlul2XfEBGv0ybKmXsHw== ARC-Authentication-Results: i=1; rspamd-7d5dc8fd68-8cjrc; auth=pass smtp.auth=dreamhost smtp.mailfrom=siddhesh@gotplt.org X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|siddhesh@gotplt.org X-MailChannels-Auth-Id: dreamhost X-Ski-Dime: 7924f3785b3d8fb5_1696255885756_2117931961 X-MC-Loop-Signature: 1696255885756:2482135189 X-MC-Ingress-Time: 1696255885756 Received: from pdx1-sub0-mail-a272.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.109.140.241 (trex/6.9.1); Mon, 02 Oct 2023 14:11:25 +0000 Received: from [192.168.2.12] (bras-vprn-toroon4834w-lp130-02-142-113-138-41.dsl.bell.ca [142.113.138.41]) (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-a272.dreamhost.com (Postfix) with ESMTPSA id 4RzjYT0Y98zLh; Mon, 2 Oct 2023 07:11:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gotplt.org; s=dreamhost; t=1696255885; bh=8j+VUt2OWnC4VHzROu2vgTCSkhB63YbW7djVZckRH44=; h=Date:Subject:To:From:Content-Type:Content-Transfer-Encoding; b=Ml/Vg2v9X4QtfHJxt8aGj2ENWK9YeikSr/eza1J6dE/FJlTFpptG39kO51b1qeMw6 NJB143MIDPeTTi3gUldtha7mp85lBiAdCI58gXAJLHUEMCN3SGDVlj7C0d91GD/t8U d0XVXy9QSmKkk8j+IkjKZkg9Ois/J4hR+gpYE42c/X4FAxeiBArWrzvuRlmTv7CH7X qc1KwbUi0CMOZMl5YefEm/KhhpGA+YiOGXahg6aZT8i4rJ3n8WafYJJPmKZYqyPk6Y /evIrQKq+Lollnhp6kW3TECZITQtn0Eq+3xwywqKoyjnZKA4DGUeEEcSUGImRjw4Az +yOzpMnFF+aog== Message-ID: Date: Mon, 2 Oct 2023 10:11:23 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: [PATCH 01/16] inet: Rearrange and sort Makefile variables Content-Language: en-US To: Arjun Shankar , libc-alpha@sourceware.org References: <20231002130150.1497733-1-arjun@redhat.com> <20231002130150.1497733-2-arjun@redhat.com> From: Siddhesh Poyarekar In-Reply-To: <20231002130150.1497733-2-arjun@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-3037.6 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS,TXREP 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-10-02 08:55, Arjun Shankar wrote: > Rearrange lists of routines, tests, etc. into one-per-line in > inet/Makefile and sort them using scripts/sort-makefile-lines.py. > --- This is a trivial, independent cleanup, please push. Reviewed-by: Siddhesh Poyarekar > inet/Makefile | 142 +++++++++++++++++++++++++++++++++++++++----------- > 1 file changed, 112 insertions(+), 30 deletions(-) > > diff --git a/inet/Makefile b/inet/Makefile > index f5249ab2b1..9db7f941c6 100644 > --- a/inet/Makefile > +++ b/inet/Makefile > @@ -22,41 +22,123 @@ subdir := inet > > include ../Makeconfig > > -headers := netinet/ether.h netinet/in.h netinet/in_systm.h \ > - netinet/if_ether.h netinet/igmp.h \ > - netinet/tcp.h netinet/ip.h $(wildcard arpa/*.h protocols/*.h) \ > - aliases.h ifaddrs.h netinet/ip6.h netinet/icmp6.h bits/in.h \ > - rpc/netdb.h > - > -routines := htonl htons \ > - inet_lnaof inet_mkadr \ > - inet_netof inet_ntoa inet_net herrno herrno-loc \ > - gethstbyad gethstbyad_r gethstbynm gethstbynm2 gethstbynm2_r \ > - gethstbynm_r gethstent gethstent_r \ > - getnetbyad getnetbyad_r getnetbynm getnetent getnetent_r \ > - getnetbynm_r \ > - getproto getproto_r getprtent getprtent_r getprtname getprtname_r \ > - getsrvbynm getsrvbynm_r getsrvbypt getsrvbypt_r getservent \ > - getservent_r getrpcent getrpcbyname getrpcbynumber \ > - getrpcent_r getrpcbyname_r getrpcbynumber_r \ > - ether_aton ether_aton_r ether_hton ether_line \ > - ether_ntoa ether_ntoa_r ether_ntoh \ > - rcmd rexec ruserpass bindresvport \ > - getnetgrent_r getnetgrent \ > - getaliasent_r getaliasent getaliasname getaliasname_r \ > - in6_addr getnameinfo if_index ifaddrs inet6_option \ > - getipv4sourcefilter setipv4sourcefilter \ > - getsourcefilter setsourcefilter inet6_opt inet6_rth \ > - inet6_scopeid_pton deadline idna idna_name_classify > +headers := \ > + $(wildcard arpa/*.h protocols/*.h) \ > + aliases.h \ > + bits/in.h \ > + ifaddrs.h \ > + netinet/ether.h \ > + netinet/icmp6.h \ > + netinet/if_ether.h \ > + netinet/igmp.h \ > + netinet/in.h \ > + netinet/in_systm.h \ > + netinet/ip.h \ > + netinet/ip6.h \ > + netinet/tcp.h \ > + rpc/netdb.h \ > + # headers > + > +routines := \ > + bindresvport \ > + deadline \ > + ether_aton \ > + ether_aton_r \ > + ether_hton \ > + ether_line \ > + ether_ntoa \ > + ether_ntoa_r \ > + ether_ntoh \ > + getaliasent \ > + getaliasent_r \ > + getaliasname \ > + getaliasname_r \ > + gethstbyad \ > + gethstbyad_r \ > + gethstbynm \ > + gethstbynm2 \ > + gethstbynm2_r \ > + gethstbynm_r \ > + gethstent \ > + gethstent_r \ > + getipv4sourcefilter \ > + getnameinfo \ > + getnetbyad \ > + getnetbyad_r \ > + getnetbynm \ > + getnetbynm_r \ > + getnetent \ > + getnetent_r \ > + getnetgrent \ > + getnetgrent_r \ > + getproto \ > + getproto_r \ > + getprtent \ > + getprtent_r \ > + getprtname \ > + getprtname_r \ > + getrpcbyname \ > + getrpcbyname_r \ > + getrpcbynumber \ > + getrpcbynumber_r \ > + getrpcent \ > + getrpcent_r \ > + getservent \ > + getservent_r \ > + getsourcefilter \ > + getsrvbynm \ > + getsrvbynm_r \ > + getsrvbypt \ > + getsrvbypt_r \ > + herrno \ > + herrno-loc \ > + htonl \ > + htons \ > + idna \ > + idna_name_classify \ > + if_index \ > + ifaddrs \ > + in6_addr \ > + inet6_opt \ > + inet6_option \ > + inet6_rth \ > + inet6_scopeid_pton \ > + inet_lnaof \ > + inet_mkadr \ > + inet_net \ > + inet_netof \ > + inet_ntoa \ > + rcmd \ > + rexec \ > + ruserpass \ > + setipv4sourcefilter \ > + setsourcefilter \ > + # routines > > install-others = $(inst_sysconfdir)/rpc > > aux := check_pf check_native ifreq > > -tests := htontest test_ifindex tst-ntoa tst-ether_aton tst-network \ > - tst-gethnm test-ifaddrs bug-if1 test-inet6_opt tst-ether_line \ > - tst-getni1 tst-getni2 tst-inet6_rth tst-checks tst-checks-posix \ > - tst-sockaddr test-hnto-types tst-if_index-long > +tests := \ > + bug-if1 \ > + htontest \ > + test-hnto-types \ > + test-ifaddrs \ > + test-inet6_opt \ > + test_ifindex \ > + tst-checks \ > + tst-checks-posix \ > + tst-ether_aton \ > + tst-ether_line \ > + tst-gethnm \ > + tst-getni1 \ > + tst-getni2 \ > + tst-if_index-long \ > + tst-inet6_rth \ > + tst-network \ > + tst-ntoa \ > + tst-sockaddr \ > + # tests > > # tst-deadline must be linked statically so that we can access > # internal functions.