From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl1-x62f.google.com (mail-pl1-x62f.google.com [IPv6:2607:f8b0:4864:20::62f]) by sourceware.org (Postfix) with ESMTPS id 65CA03858D35 for ; Fri, 20 Oct 2023 12:49:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 65CA03858D35 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 65CA03858D35 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::62f ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1697806172; cv=none; b=aIFKTr1R1IXOlAyyFE9SbCa07fnZDGuLj3kkK+nH2PwLk2gCvCEueg61UDVERDLcajrprbWPiFgyF/YLEeZlxIPQ4VDL6ajxtprATGD2EudONKU0ZnIO8mau0xkZo+zsjwCE1yaYDhgZAZ/g8sEHNt8tR+iovBrUPj1zvMW62pE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1697806172; c=relaxed/simple; bh=lt2DkkzRasdBnyxQps8Sd/3CUO2Yv7IwwEF33IvR8wA=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:To:From; b=QRphXLzVjdlNbo0F4HR1z/aQSdnb0132TWhfu4vIn0vLOrgopgbL5Lmw2wNjSrDbdwHSBU5jCPWV1klnwQhhaWOGBPn4B6iEJD9bFPwUq16N1Li3/NxZdp66WbVhxxhKEhk7JJLBzplaEz+UYW/1G2BMyoXCOgdp058MP5YmmEo= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-1ca816f868fso5455385ad.1 for ; Fri, 20 Oct 2023 05:49:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697806169; x=1698410969; 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=ME3w2uhCP8Dp0TDuogGCeY3zKiVJ1YDoeWqwp/tUlYE=; b=ltC3T/WBDIvwyq8vnO1y4X1Tca1qszODdCo3qQLfGZg/CIxXdtHCElMLpdEaBEshH5 OOrcpEPq3cnOQMMccSPTVxKneea1niLHsZEInRBG9l2Q6iQaFbuWULSWODeO26LfrMGi IdbPDShB4Xmmc25nfs2YxXVoxbDosub63mTzbQtwRyyVhesen4pTOLTXWSG0jy+VVerm 44FLb8Hgz27+FstSZlGqoID4tnSDJLCkCSsByZN78ZFr6zYybqtu4uWy38gmv+UUozqn MqPLq4uwd15XzgsW+QMmGubyLL6R3XenyGLD24uyJckbod8lsmobhRkhtU3LqXn5UZXJ gT8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697806169; x=1698410969; 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=ME3w2uhCP8Dp0TDuogGCeY3zKiVJ1YDoeWqwp/tUlYE=; b=wOHq7JXa2g1ycXo9/HlRe3B5oozYMaZfpCvoIiahfWZX35HASU6NN9rGlmTNO+lKyt bKTaG9DmVYg5M3INrtF0hLAC35g/H1sCAV2X1+dQasMup4U9JJrlOSOioeIKg1YqjBX9 vbTg4yxd6p96qihb22jmh9ITD+b3aWakMOFYHgp0ceM0u8F/WR6i0zeXf5mQbjBRUIF+ ya1ZGD2gguxYsqNMqb1TkMpLldwIXPhGOW0TK9rOrJnNo31KovESZ7wVChk4Ub0VBSB/ WM2q1rSW0T8hFovRhzbhS9MpckgN4Z5kPHhcZdMRue+EESjxvF2D6jRV5fQj1K0IEac8 pK7Q== X-Gm-Message-State: AOJu0YyE4WvVN5yRsNEM8ih2L2CF3KnTEXHXu2+7wFsXib1DF7bb84oN O/jd6RX7Arkh+sfcc7ZRCow5dQ== X-Google-Smtp-Source: AGHT+IFMJORuqdUe+yia9xMw8yAac90uR85KZQdQXm3GyadZ31FRwdzNcjNo2ewhhdn+CaRXZkpg3A== X-Received: by 2002:a17:902:e801:b0:1c9:d143:e9e with SMTP id u1-20020a170902e80100b001c9d1430e9emr1963262plg.18.1697806169195; Fri, 20 Oct 2023 05:49:29 -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 y6-20020a17090322c600b001c9cb2fb8d8sm1451785plg.49.2023.10.20.05.49.27 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 20 Oct 2023 05:49:28 -0700 (PDT) Message-ID: <3ec013f2-ae2e-4ad0-8cc6-e6b69d0239ab@linaro.org> Date: Fri, 20 Oct 2023 09:49:27 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 13/16] Move 'rpc' 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-14-arjun@redhat.com> From: Adhemerval Zanella Netto Organization: Linaro In-Reply-To: <20231002130150.1497733-14-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 getrpcby* and getrpcent* routines are entry points for nss > functionality. This commit moves them from the 'inet' subdirectory to > 'nss'. The Versions entries for these routines along with a test, > located in the 'sunrpc' subdirectory, are also moved into 'nss'. LGTM, thanks. Reviewed-by: Adhemerval Zanella > --- > inet/Makefile | 8 -------- > nss/Makefile | 16 ++++++++++++++++ > nss/Versions | 2 ++ > {inet => nss}/getrpcbyname.c | 0 > {inet => nss}/getrpcbyname_r.c | 0 > {inet => nss}/getrpcbynumber.c | 0 > {inet => nss}/getrpcbynumber_r.c | 0 > {inet => nss}/getrpcent.c | 0 > {inet => nss}/getrpcent_r.c | 0 > {sunrpc => nss}/test-rpcent.c | 0 > sunrpc/Makefile | 2 +- > sunrpc/Versions | 3 +-- > 12 files changed, 20 insertions(+), 11 deletions(-) > rename {inet => nss}/getrpcbyname.c (100%) > rename {inet => nss}/getrpcbyname_r.c (100%) > rename {inet => nss}/getrpcbynumber.c (100%) > rename {inet => nss}/getrpcbynumber_r.c (100%) > rename {inet => nss}/getrpcent.c (100%) > rename {inet => nss}/getrpcent_r.c (100%) > rename {sunrpc => nss}/test-rpcent.c (100%) > > diff --git a/inet/Makefile b/inet/Makefile > index dab7182a11..3c1987877a 100644 > --- a/inet/Makefile > +++ b/inet/Makefile > @@ -48,12 +48,6 @@ routines := \ > ether_ntoa_r \ > getipv4sourcefilter \ > getnameinfo \ > - getrpcbyname \ > - getrpcbyname_r \ > - getrpcbynumber \ > - getrpcbynumber_r \ > - getrpcent \ > - getrpcent_r \ > getservent \ > getservent_r \ > getsourcefilter \ > @@ -132,8 +126,6 @@ include ../gen-locales.mk > ifeq ($(have-thread-library),yes) > > CFLAGS-rcmd.c += -fexceptions > -CFLAGS-getrpcent_r.c += -fexceptions > -CFLAGS-getrpcent.c += -fexceptions > CFLAGS-getservent_r.c += -fexceptions > CFLAGS-getservent.c += -fexceptions > CFLAGS-either_ntoh.c += -fexceptions > diff --git a/nss/Makefile b/nss/Makefile > index df22d3655c..cbfd5dc692 100644 > --- a/nss/Makefile > +++ b/nss/Makefile > @@ -214,6 +214,21 @@ CFLAGS-getpwent.c += -fexceptions > CFLAGS-getpwent_r.c += -fexceptions > endif > > +# rpc routines: > +routines += \ > + getrpcbyname \ > + getrpcbyname_r \ > + getrpcbynumber \ > + getrpcbynumber_r \ > + getrpcent \ > + getrpcent_r \ > + # routines > + > +ifeq ($(have-thread-library),yes) > +CFLAGS-getrpcent_r.c += -fexceptions > +CFLAGS-getrpcent.c += -fexceptions > +endif > + > # shadow routines > routines += \ > fgetspent \ > @@ -276,6 +291,7 @@ tests := \ > bug17079 \ > test-digits-dots \ > test-netdb \ > + test-rpcent \ > testgrp \ > tst-fgetsgent_r \ > tst-gethnm \ > diff --git a/nss/Versions b/nss/Versions > index c5de97fb53..b7491154bf 100644 > --- a/nss/Versions > +++ b/nss/Versions > @@ -30,6 +30,8 @@ libc { > getprotobyname; getprotobyname_r; getprotobynumber; > getprotobynumber_r; getprotoent; getprotoent_r; > getpw; getpwent; getpwent_r; getpwnam; getpwnam_r; getpwuid; getpwuid_r; > + getrpcbyname; getrpcbyname_r; getrpcbynumber; getrpcbynumber_r; > + getrpcent; getrpcent_r; > getspent; getspent_r; getspnam; getspnam_r; > > # i* > diff --git a/inet/getrpcbyname.c b/nss/getrpcbyname.c > similarity index 100% > rename from inet/getrpcbyname.c > rename to nss/getrpcbyname.c > diff --git a/inet/getrpcbyname_r.c b/nss/getrpcbyname_r.c > similarity index 100% > rename from inet/getrpcbyname_r.c > rename to nss/getrpcbyname_r.c > diff --git a/inet/getrpcbynumber.c b/nss/getrpcbynumber.c > similarity index 100% > rename from inet/getrpcbynumber.c > rename to nss/getrpcbynumber.c > diff --git a/inet/getrpcbynumber_r.c b/nss/getrpcbynumber_r.c > similarity index 100% > rename from inet/getrpcbynumber_r.c > rename to nss/getrpcbynumber_r.c > diff --git a/inet/getrpcent.c b/nss/getrpcent.c > similarity index 100% > rename from inet/getrpcent.c > rename to nss/getrpcent.c > diff --git a/inet/getrpcent_r.c b/nss/getrpcent_r.c > similarity index 100% > rename from inet/getrpcent_r.c > rename to nss/getrpcent_r.c > diff --git a/sunrpc/test-rpcent.c b/nss/test-rpcent.c > similarity index 100% > rename from sunrpc/test-rpcent.c > rename to nss/test-rpcent.c > diff --git a/sunrpc/Makefile b/sunrpc/Makefile > index ec2ea04ca9..83a0f2d099 100644 > --- a/sunrpc/Makefile > +++ b/sunrpc/Makefile > @@ -64,7 +64,7 @@ routines := auth_none authuxprot clnt_raw clnt_simp \ > shared-only-routines = $(routines) > endif > > -tests = tst-xdrmem tst-xdrmem2 test-rpcent tst-udp-error tst-udp-timeout \ > +tests = tst-xdrmem tst-xdrmem2 tst-udp-error tst-udp-timeout \ > tst-udp-nonblocking tst-bug22542 tst-bug28768 > > xtests := tst-getmyaddr > diff --git a/sunrpc/Versions b/sunrpc/Versions > index 77bc6a4c9b..cba6e36422 100644 > --- a/sunrpc/Versions > +++ b/sunrpc/Versions > @@ -26,8 +26,7 @@ libc { > > # g* > get_myaddress; getpublickey; getsecretkey; > - getrpcbyname; getrpcbyname_r; getrpcbynumber; getrpcbynumber_r; > - getrpcent; getrpcent_r; getrpcport; > + getrpcport; > > # p* > pmap_getmaps; pmap_getport; pmap_rmtcall; pmap_set; pmap_unset;