From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oi1-x22d.google.com (mail-oi1-x22d.google.com [IPv6:2607:f8b0:4864:20::22d]) by sourceware.org (Postfix) with ESMTPS id 9F5703858D20 for ; Fri, 20 Oct 2023 12:17:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9F5703858D20 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 9F5703858D20 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::22d ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1697804280; cv=none; b=bSsLzywBXAUZ9WZX2HuyXOEHsT/TfftVKJTvy0D87dXMCO9hFhL1j0gfMtJGy6DcaQe0Xk6qMES/Rd8grVC24ZJXIMIbC5cVHaDAfF9djhSiU+RwlmNsFjQnV6wm2014MB8+JcWPvs4/ckxG5WxY9vtyY3o6AZyvNstghCEGc4E= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1697804280; c=relaxed/simple; bh=1U+rRTVQvKgHCvgAIzMU5yIdqb9a72Qh2qBNz8SErtI=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:To:From; b=RCnzk03N+3q48Ag2EqcWYk4fLSGQIilhERh8zWmXXwbHHZS7rREM+ev8ETuFJ5ybAsBQ/SJQUBsPJ9lkIKAxJnstfn9UsYiaQEpxo6Wv6ewNPXN9q+ugZlHdv024TQqje0hX+R50XQvjyZet4yS3/D0dIAindQ8MmcYvsg+CIgU= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-oi1-x22d.google.com with SMTP id 5614622812f47-3b3e13fc1f7so530603b6e.0 for ; Fri, 20 Oct 2023 05:17:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697804277; x=1698409077; 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=pjy3tVVm6/ZdtGkfU9/9Gdqp1DrvtttgAt68A4XLOxM=; b=lUyGZePK7mH+H3i8AjhsY1U9ModXX7wRbMp8pf4pW07o0aOyNMjEAW8yzH7SliCMB9 Y56SFcrnzAOOf5LHTDJ/SMFPDUFFDBnf+By8K1/pcrD2vsCilczUd9b6/fhPV6P62aUH OO/ntVmEHhM1YNZqBxVmxPtznniw8Mj61Xbq9EVOsDfGpMqSe0HZSRFpweEdqmRzdYtB plUUEHJLg3RiOEhGZexyKyGLj/J0WKDIcQedenejk/pjrA76fe7KLIg8VVRW3U+IH5qU tmoTejGVjrHcs2xw7vyz9Ojj43ixEI8uH3SxUgOU4O7zObn+9ZIJaDdewECphcQqCUAR b59g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697804277; x=1698409077; 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=pjy3tVVm6/ZdtGkfU9/9Gdqp1DrvtttgAt68A4XLOxM=; b=olK5YvN23C/sU3/7PhzotbYuPWjtsifVsHbxWvrKKXZul86PwAE/dlQ8UvCz/KiCIv /E2ZmpIzYNcZtBseuLmUqGClSbvfzKpKFkE8t9IF941qY8OUlpcJwoznr5pwAWk5kG+0 o2xdSBEgKkYOJjSYTNg4XIckOwhodZIoGCLLTu6plXM5p0LAc5YxAsrcaC/GXWnoWkZQ xRElYydzThKJsyscjjDExgy2pWwiYvt3qOoqTWgS8F8pJkxsc6rsE4ZzVBoRuy9TNMdQ wRd06z/Px/aWw2h9Ia2hE74EwvYLXxG/FNwUobCNy7EFjftuI3HLuPZ0u6XpiKlZOA7R GUtQ== X-Gm-Message-State: AOJu0YyfjYdIRe7XPqrzHEFqP3/hzifo69o1Tbnd0EfkOA7r90O5wWjx 14zZJHZ5zGhjaT50A4fruwu9ja8ysgueWjjbIDyhZQ== X-Google-Smtp-Source: AGHT+IFHYCZzopME2zAaoeA1H8TL98mkgtcc4jY7LHOtlJbfZl5u244NY6ChHZsFmI9EYQ0qLN7W2Q== X-Received: by 2002:a05:6358:478e:b0:135:73b0:cc6c with SMTP id i14-20020a056358478e00b0013573b0cc6cmr1489812rwn.28.1697804276803; Fri, 20 Oct 2023 05:17:56 -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 y10-20020a62ce0a000000b0069ea08a2a99sm1452155pfg.211.2023.10.20.05.17.55 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 20 Oct 2023 05:17:56 -0700 (PDT) Message-ID: <99b2c980-513c-4a79-8e02-e6511c95e7a0@linaro.org> Date: Fri, 20 Oct 2023 09:17:53 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 11/16] Move 'networks' 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-12-arjun@redhat.com> From: Adhemerval Zanella Netto Organization: Linaro In-Reply-To: <20231002130150.1497733-12-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 getnetby* and getnetent* 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 | 12 ------------ > inet/Versions | 3 +-- > nss/Makefile | 19 +++++++++++++++++++ > nss/Versions | 2 ++ > {inet => nss}/getnetbyad.c | 0 > {inet => nss}/getnetbyad_r.c | 0 > {inet => nss}/getnetbynm.c | 0 > {inet => nss}/getnetbynm_r.c | 0 > {inet => nss}/getnetent.c | 0 > {inet => nss}/getnetent_r.c | 0 > 10 files changed, 22 insertions(+), 14 deletions(-) > rename {inet => nss}/getnetbyad.c (100%) > rename {inet => nss}/getnetbyad_r.c (100%) > rename {inet => nss}/getnetbynm.c (100%) > rename {inet => nss}/getnetbynm_r.c (100%) > rename {inet => nss}/getnetent.c (100%) > rename {inet => nss}/getnetent_r.c (100%) > > diff --git a/inet/Makefile b/inet/Makefile > index 9f39f7ff2b..776cbfa0fd 100644 > --- a/inet/Makefile > +++ b/inet/Makefile > @@ -48,12 +48,6 @@ routines := \ > ether_ntoa_r \ > getipv4sourcefilter \ > getnameinfo \ > - getnetbyad \ > - getnetbyad_r \ > - getnetbynm \ > - getnetbynm_r \ > - getnetent \ > - getnetent_r \ > getproto \ > getproto_r \ > getprtent \ > @@ -144,12 +138,6 @@ include ../gen-locales.mk > ifeq ($(have-thread-library),yes) > > CFLAGS-rcmd.c += -fexceptions > -CFLAGS-getnetbynm_r.c += -fexceptions > -CFLAGS-getnetbynm.c += -fexceptions > -CFLAGS-getnetbyad_r.c += -fexceptions > -CFLAGS-getnetbyad.c += -fexceptions > -CFLAGS-getnetent_r.c += -fexceptions > -CFLAGS-getnetent.c += -fexceptions > CFLAGS-getrpcent_r.c += -fexceptions > CFLAGS-getrpcent.c += -fexceptions > CFLAGS-getservent_r.c += -fexceptions > diff --git a/inet/Versions b/inet/Versions > index 1ffa444730..051b305e48 100644 > --- a/inet/Versions > +++ b/inet/Versions > @@ -14,8 +14,7 @@ libc { > ether_ntoa_r; > > # g* > - getdomainname; getnetbyaddr; getnetbyaddr_r; getnetbyname; > - getnetbyname_r; getnetent; getnetent_r; > + getdomainname; > getprotobyname; getprotobyname_r; getprotobynumber; > getprotobynumber_r; getprotoent; getprotoent_r; > getservbyname; getservbyname_r; getservbyport; > diff --git a/nss/Makefile b/nss/Makefile > index 2a451f68d9..023a11fa4b 100644 > --- a/nss/Makefile > +++ b/nss/Makefile > @@ -159,6 +159,25 @@ CFLAGS-getnetgrent.c += -fexceptions > CFLAGS-getnetgrent_r.c += -fexceptions > endif > > +# networks routines: > +routines += \ > + getnetbyad \ > + getnetbyad_r \ > + getnetbynm \ > + getnetbynm_r \ > + getnetent \ > + getnetent_r \ > + # routines > + > +ifeq ($(have-thread-library),yes) > +CFLAGS-getnetbyad.c += -fexceptions > +CFLAGS-getnetbyad_r.c += -fexceptions > +CFLAGS-getnetbynm.c += -fexceptions > +CFLAGS-getnetbynm_r.c += -fexceptions > +CFLAGS-getnetent.c += -fexceptions > +CFLAGS-getnetent_r.c += -fexceptions > +endif > + > # pwd routines: > routines += \ > fgetpwent \ > diff --git a/nss/Versions b/nss/Versions > index 4ddc018012..95219f0fc7 100644 > --- a/nss/Versions > +++ b/nss/Versions > @@ -25,6 +25,8 @@ libc { > gethostbyaddr; gethostbyaddr_r; gethostbyname; gethostbyname2; > gethostbyname2_r; gethostbyname_r; gethostent; gethostent_r; > getnetgrent; getnetgrent_r; > + getnetbyaddr; getnetbyaddr_r; getnetbyname; getnetbyname_r; > + getnetent; getnetent_r; > getpw; getpwent; getpwent_r; getpwnam; getpwnam_r; getpwuid; getpwuid_r; > getspent; getspent_r; getspnam; getspnam_r; > > diff --git a/inet/getnetbyad.c b/nss/getnetbyad.c > similarity index 100% > rename from inet/getnetbyad.c > rename to nss/getnetbyad.c > diff --git a/inet/getnetbyad_r.c b/nss/getnetbyad_r.c > similarity index 100% > rename from inet/getnetbyad_r.c > rename to nss/getnetbyad_r.c > diff --git a/inet/getnetbynm.c b/nss/getnetbynm.c > similarity index 100% > rename from inet/getnetbynm.c > rename to nss/getnetbynm.c > diff --git a/inet/getnetbynm_r.c b/nss/getnetbynm_r.c > similarity index 100% > rename from inet/getnetbynm_r.c > rename to nss/getnetbynm_r.c > diff --git a/inet/getnetent.c b/nss/getnetent.c > similarity index 100% > rename from inet/getnetent.c > rename to nss/getnetent.c > diff --git a/inet/getnetent_r.c b/nss/getnetent_r.c > similarity index 100% > rename from inet/getnetent_r.c > rename to nss/getnetent_r.c