From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ot1-x32c.google.com (mail-ot1-x32c.google.com [IPv6:2607:f8b0:4864:20::32c]) by sourceware.org (Postfix) with ESMTPS id B263D3858D20 for ; Fri, 20 Oct 2023 12:32:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B263D3858D20 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org B263D3858D20 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::32c ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1697805168; cv=none; b=wg03CbDznEl5jqvDUUdct6jxhe9Ote53PqLV/U5YOjaojEnft1TM7ed6xR3lTl7tT0ET+EMg6gihYZAfJiM6A55xAugsiQcZO6gebAIlH7H9j+kZSCcqJBJe16Tt7iwgqD0Zh2XXHxHrCqqYvOL8G8eyKGHm4NRdW4Ih0UBvz9w= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1697805168; c=relaxed/simple; bh=6r8a3ttD7GrOeujA/320A3PsGELzbtAt06fDjneH3yE=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:To:From; b=RaS8OtfQxdi4K7hZY4aV/eA8e05MGW5NdbfGUK/guYrfmlrtMfSv1qcxaPRQHElkmoO1VHBGQY8nJ61F49n8cAkTZWfONi+LCiThqh6jfivo0jKtSLMn5j+KxGU9shQ8WJRQmqepdQpYTd9sRZKy0OrtXfJ+E4PRNUS4PIUE4ek= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-ot1-x32c.google.com with SMTP id 46e09a7af769-6ce37d0f13fso322986a34.2 for ; Fri, 20 Oct 2023 05:32:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697805166; x=1698409966; darn=sourceware.org; h=content-transfer-encoding:in-reply-to:organization:from:references :to:content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=oXJihZzFL9l8QMoIz9u8la4A6gRC48foo2KVJUnApsg=; b=KDLR4V/sUzakKt1pt4TWTxmNxzfwmHrp1C1N68RxT9Z2rzLZr2ritOBcSZGfP/S6kZ blqEthTLv1SmofgtmmfGM8lcXQT0HloJ/a2ZRhH55XYk03iV8Ym4/vJbL2ut1pE7KCoR aVq13wQ/7CXsOV67cVOHA81jwcOY3NXO2UTfGTW/rwkvaZfYGqxSe7ltmsfxeZY+aboi Beqr/jLS6EYEddBb33co2Sr8IpGFS8z3XYXJsvHgDuN1p1VLkJRVPlLEgYvg4lZ+zckU kbHVSbAcifjLkMCrFacuoWuijHHVOriGrB0274Yobim/8sebrwKPz5iuk3CmXtZixnZo QIQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697805166; x=1698409966; h=content-transfer-encoding:in-reply-to:organization:from:references :to:content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=oXJihZzFL9l8QMoIz9u8la4A6gRC48foo2KVJUnApsg=; b=baBQE9iOR2abPs6gJXjJDK6msfLtt/5gUkOkZeeYNMLQ3mmxBvrnAGZE730c/pjDxy hYTZk0IEXarBRchwgIZMJzNmde03SThSpN1Fgw+wdGveMYtkvYWnbJpVcTDbOMb4sE2+ +ge/lgSFGPZ0hJ/+pJpDiZSxvGXSAVkqNQKrmwS7mN0+nMoqI7X6Ok7uNcVjvskP6Tzl /Lm6kRZnkX4rPrL3ntbO+Lk31MSNkiHBq1yzhzH+jWN6j6ocHd7HUvbsXl1OC1ddNg96 sEtxLB+uYUF1YQ6Rplday9aWu4eCQZqSEmcIg7nb0VCyPW8rfIqggpPm9Oxt9tNG8wuF KqMg== X-Gm-Message-State: AOJu0YxD3/oBSqKjNvha21R0/QLuErpEsZF2em9+j8ekVqBrT41ahafq L3F9wcGznJvViijzY7J09F5rxhT6QFjQwjJaxtCt9Q== X-Google-Smtp-Source: AGHT+IFHmcUfK5Oj4A/qATsRh/D3a7zckkyAo46uS7UDT5HwLIcL19N1NsTyDT0IfiujHa5PcHs3YA== X-Received: by 2002:a05:6830:4386:b0:6b9:cba6:b246 with SMTP id s6-20020a056830438600b006b9cba6b246mr2292744otv.9.1697805165980; Fri, 20 Oct 2023 05:32:45 -0700 (PDT) Received: from ?IPV6:2804:1b3:a7c3:a647:b489:1074:73d4:b147? ([2804:1b3:a7c3:a647:b489:1074:73d4:b147]) by smtp.gmail.com with ESMTPSA id i18-20020aa796f2000000b0068fcb70ccafsm1400185pfq.129.2023.10.20.05.32.44 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 20 Oct 2023 05:32:45 -0700 (PDT) Message-ID: <826a51f6-fd9b-4806-8e13-9585b009225f@linaro.org> Date: Fri, 20 Oct 2023 09:32:42 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 12/16] Move 'protocols' routines from 'inet' into 'nss' Content-Language: en-US To: Arjun Shankar , libc-alpha@sourceware.org References: <20231002130150.1497733-1-arjun@redhat.com> <20231002130150.1497733-13-arjun@redhat.com> From: Adhemerval Zanella Netto Organization: Linaro In-Reply-To: <20231002130150.1497733-13-arjun@redhat.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.9 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.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On 02/10/23 09:55, Arjun Shankar wrote: > The getprotoby* and getprotoent* routines are entry points for nss > functionality. This commit moves them from the 'inet' subdirectory to > 'nss'. LGTM, thanks. Reviewed-by: Adhemerval Zanella > --- > inet/Makefile | 8 -------- > inet/Versions | 5 +---- > nss/Makefile | 15 +++++++++++++++ > nss/Versions | 3 +++ > {inet => nss}/getproto.c | 0 > {inet => nss}/getproto_r.c | 0 > {inet => nss}/getprtent.c | 0 > {inet => nss}/getprtent_r.c | 0 > {inet => nss}/getprtname.c | 0 > {inet => nss}/getprtname_r.c | 0 > 10 files changed, 19 insertions(+), 12 deletions(-) > rename {inet => nss}/getproto.c (100%) > rename {inet => nss}/getproto_r.c (100%) > rename {inet => nss}/getprtent.c (100%) > rename {inet => nss}/getprtent_r.c (100%) > rename {inet => nss}/getprtname.c (100%) > rename {inet => nss}/getprtname_r.c (100%) > > diff --git a/inet/Makefile b/inet/Makefile > index 776cbfa0fd..dab7182a11 100644 > --- a/inet/Makefile > +++ b/inet/Makefile > @@ -48,12 +48,6 @@ routines := \ > ether_ntoa_r \ > getipv4sourcefilter \ > getnameinfo \ > - getproto \ > - getproto_r \ > - getprtent \ > - getprtent_r \ > - getprtname \ > - getprtname_r \ > getrpcbyname \ > getrpcbyname_r \ > getrpcbynumber \ > @@ -142,8 +136,6 @@ CFLAGS-getrpcent_r.c += -fexceptions > CFLAGS-getrpcent.c += -fexceptions > CFLAGS-getservent_r.c += -fexceptions > CFLAGS-getservent.c += -fexceptions > -CFLAGS-getprtent_r.c += -fexceptions > -CFLAGS-getprtent.c += -fexceptions > CFLAGS-either_ntoh.c += -fexceptions > CFLAGS-either_hton.c += -fexceptions > CFLAGS-in6_addr.c += $(config-cflags-wno-ignored-attributes) > diff --git a/inet/Versions b/inet/Versions > index 051b305e48..c0c64e1543 100644 > --- a/inet/Versions > +++ b/inet/Versions > @@ -15,8 +15,6 @@ libc { > > # g* > getdomainname; > - getprotobyname; getprotobyname_r; getprotobynumber; > - getprotobynumber_r; getprotoent; getprotoent_r; > getservbyname; getservbyname_r; getservbyport; > getservbyport_r; getservent; getservent_r; > > @@ -48,8 +46,7 @@ libc { > # g* > getaliasbyname_r; getaliasent_r; gethostbyaddr_r; gethostbyname2_r; > gethostbyname_r; gethostent_r; getnetbyaddr_r; getnetbyname_r; > - getnetent_r; getprotobyname_r; getprotobynumber_r; > - getprotoent_r; getservbyname_r; > + getnetent_r; getservbyname_r; > getservbyport_r; > getservent_r; > } > diff --git a/nss/Makefile b/nss/Makefile > index 023a11fa4b..df22d3655c 100644 > --- a/nss/Makefile > +++ b/nss/Makefile > @@ -178,6 +178,21 @@ CFLAGS-getnetent.c += -fexceptions > CFLAGS-getnetent_r.c += -fexceptions > endif > > +# protocols routines: > +routines += \ > + getproto \ > + getproto_r \ > + getprtent \ > + getprtent_r \ > + getprtname \ > + getprtname_r \ > + # routines > + > +ifeq ($(have-thread-library),yes) > +CFLAGS-getprtent_r.c += -fexceptions > +CFLAGS-getprtent.c += -fexceptions > +endif > + > # pwd routines: > routines += \ > fgetpwent \ > diff --git a/nss/Versions b/nss/Versions > index 95219f0fc7..c5de97fb53 100644 > --- a/nss/Versions > +++ b/nss/Versions > @@ -27,6 +27,8 @@ libc { > getnetgrent; getnetgrent_r; > getnetbyaddr; getnetbyaddr_r; getnetbyname; getnetbyname_r; > getnetent; getnetent_r; > + getprotobyname; getprotobyname_r; getprotobynumber; > + getprotobynumber_r; getprotoent; getprotoent_r; > getpw; getpwent; getpwent_r; getpwnam; getpwnam_r; getpwuid; getpwuid_r; > getspent; getspent_r; getspnam; getspnam_r; > > @@ -58,6 +60,7 @@ libc { > # g* > getgrent_r; getgrgid_r; getgrnam_r; > getnetgrent_r; > + getprotobyname_r; getprotobynumber_r; getprotoent_r; > getpwent_r; getpwuid_r; getpwnam_r; > getspent_r; getspnam_r; > } > diff --git a/inet/getproto.c b/nss/getproto.c > similarity index 100% > rename from inet/getproto.c > rename to nss/getproto.c > diff --git a/inet/getproto_r.c b/nss/getproto_r.c > similarity index 100% > rename from inet/getproto_r.c > rename to nss/getproto_r.c > diff --git a/inet/getprtent.c b/nss/getprtent.c > similarity index 100% > rename from inet/getprtent.c > rename to nss/getprtent.c > diff --git a/inet/getprtent_r.c b/nss/getprtent_r.c > similarity index 100% > rename from inet/getprtent_r.c > rename to nss/getprtent_r.c > diff --git a/inet/getprtname.c b/nss/getprtname.c > similarity index 100% > rename from inet/getprtname.c > rename to nss/getprtname.c > diff --git a/inet/getprtname_r.c b/nss/getprtname_r.c > similarity index 100% > rename from inet/getprtname_r.c > rename to nss/getprtname_r.c