From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl1-x631.google.com (mail-pl1-x631.google.com [IPv6:2607:f8b0:4864:20::631]) by sourceware.org (Postfix) with ESMTPS id 8C43A3858D20 for ; Fri, 20 Oct 2023 13:19:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8C43A3858D20 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 8C43A3858D20 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::631 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1697807995; cv=none; b=pjf/Edmvp/Uz5kXBv3wbXuPBc8fWnczsWK4zl7Kot9gbmzqJcxH2q31SuYqvtNFK/Cl/fihmlbkrFg68uG6Jy8OPY5bh3Xo38UB/SNweRQJhoAG+LGGOJIxnqTmYpL2FUIfSIlI2/5uSn0YaQhyDjOsY0DDKKwjkSVJ+gIus/E0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1697807995; c=relaxed/simple; bh=/KGlKFzf8gs398P1LjPCzfWFw01XbSUJ0jsGdaL0uEI=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:To:From; b=sbv1g18tqvdID49uOFSG2QBq9doBpx7YzDHlo7OTHdfmmiWnR/o7GhXUWUaciWzDlo/duXqd1c4o1D++CVv3CzNGBkC7udva4MbTLDDu13mNDfPdhLPe0a+/69yMACNJpsi/lBV6D9cMdarQuBeiJ4wDvDR7f+XmJKwYsFZN/98= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-1c5cd27b1acso6358275ad.2 for ; Fri, 20 Oct 2023 06:19:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697807992; x=1698412792; 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=hboClkii26W7PRPz19u2o9aj+GIpSTu5Dm7wMu2bpMo=; b=YxM7YgPTxgOLfB991cCnRifID55lSEZCaaKDAASVuZZQPddk2nnU20+06cbYDJ6d5I dE7HyfIfzOxXe3n+luNhgpAggGrHzOtaVqtD877vjFpFABJSkHJrGaeBEuG7Ay0rEyQ/ g29dAJ5YLOsbZBj1AUlXMHK8s7DlS52vaumQMos0EbAPFGCyecwHveh0DbgVibPNBzF0 1rSaL75fZEQCJxZoQl8g4vgPDzSaYAUI9QJFh9ZeEoT3zIOHQ5Y9PC2JcPyMpLxFYglv YC9tzJ8bBUSCz2VjXwfBbECpJBt+AjadCcH9Q1qIJehJjfLYRNi4ripV75gB5+xqkBys nBew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697807992; x=1698412792; 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=hboClkii26W7PRPz19u2o9aj+GIpSTu5Dm7wMu2bpMo=; b=IVB7rG4293RyHRABJ71CYUhu76H1aJrURHLUiRByWYOX2p4bMhxnYRY/x1gIVX9Ent J1pAYi1uKSHWevoxwr/etPu1fLPROuYro/YB3oLdq6ROzKsLzlGqVDneEub7h+oN2IQn yLdkz23Wlbm6InYaha6h+psTBT9YP5HyXBNYA0p7UXEpxPsP4+k/+tsGwgTSVohfJP6u H3CEWYwPzXH/jFdU419vnilZr2BEhKP6qnPEcrTHJJfwBZOdqO6qnyyfGLZMURl/UdA+ 3mHPJB623BOhO9t03gQC05fKvcoUBvye5IhyVywtlivf8R3cwsd2y2H6Fih2ZoxX2ITm ouOw== X-Gm-Message-State: AOJu0Yw1dMPVaYbJXGRETzVFfLxeKTxQpR7VCopo77iTZHzEcTqfdThr yJK4tJwvmBF0xO0dIGp/u6MQAtqcGiywlpgjf7sDsA== X-Google-Smtp-Source: AGHT+IFMS+MndGg2kELQSlLdD+w5dg0NfdzKEjlALwB8C4JHYb8D6iiN6B8wYLaPIi/BArVlQnl1Gw== X-Received: by 2002:a17:902:e5c3:b0:1c9:aac5:df1a with SMTP id u3-20020a170902e5c300b001c9aac5df1amr2057062plf.51.1697807992449; Fri, 20 Oct 2023 06:19:52 -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 h4-20020a170902eec400b001c9cc885022sm1491722plb.259.2023.10.20.06.19.51 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 20 Oct 2023 06:19:51 -0700 (PDT) Message-ID: Date: Fri, 20 Oct 2023 10:19:49 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 14/16] Move 'services' 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-15-arjun@redhat.com> From: Adhemerval Zanella Netto Organization: Linaro In-Reply-To: <20231002130150.1497733-15-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 getservby* and getservent* 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 | 6 +----- > nss/Makefile | 15 +++++++++++++++ > nss/Versions | 3 +++ > {inet => nss}/getservent.c | 0 > {inet => nss}/getservent_r.c | 0 > {inet => nss}/getsrvbynm.c | 0 > {inet => nss}/getsrvbynm_r.c | 0 > {inet => nss}/getsrvbypt.c | 0 > {inet => nss}/getsrvbypt_r.c | 0 > 10 files changed, 19 insertions(+), 13 deletions(-) > rename {inet => nss}/getservent.c (100%) > rename {inet => nss}/getservent_r.c (100%) > rename {inet => nss}/getsrvbynm.c (100%) > rename {inet => nss}/getsrvbynm_r.c (100%) > rename {inet => nss}/getsrvbypt.c (100%) > rename {inet => nss}/getsrvbypt_r.c (100%) > > diff --git a/inet/Makefile b/inet/Makefile > index 3c1987877a..d275f51b3f 100644 > --- a/inet/Makefile > +++ b/inet/Makefile > @@ -48,13 +48,7 @@ routines := \ > ether_ntoa_r \ > getipv4sourcefilter \ > getnameinfo \ > - getservent \ > - getservent_r \ > getsourcefilter \ > - getsrvbynm \ > - getsrvbynm_r \ > - getsrvbypt \ > - getsrvbypt_r \ > herrno \ > herrno-loc \ > htonl \ > @@ -126,8 +120,6 @@ include ../gen-locales.mk > ifeq ($(have-thread-library),yes) > > CFLAGS-rcmd.c += -fexceptions > -CFLAGS-getservent_r.c += -fexceptions > -CFLAGS-getservent.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 c0c64e1543..7765cb7722 100644 > --- a/inet/Versions > +++ b/inet/Versions > @@ -15,8 +15,6 @@ libc { > > # g* > getdomainname; > - getservbyname; getservbyname_r; getservbyport; > - getservbyport_r; getservent; getservent_r; > > # h* > htonl; htons; > @@ -46,9 +44,7 @@ libc { > # g* > getaliasbyname_r; getaliasent_r; gethostbyaddr_r; gethostbyname2_r; > gethostbyname_r; gethostent_r; getnetbyaddr_r; getnetbyname_r; > - getnetent_r; getservbyname_r; > - getservbyport_r; > - getservent_r; > + getnetent_r; > } > GLIBC_2.2 { > # i* > diff --git a/nss/Makefile b/nss/Makefile > index cbfd5dc692..e88754bf51 100644 > --- a/nss/Makefile > +++ b/nss/Makefile > @@ -229,6 +229,21 @@ CFLAGS-getrpcent_r.c += -fexceptions > CFLAGS-getrpcent.c += -fexceptions > endif > > +# services routines: > +routines += \ > + getservent \ > + getservent_r \ > + getsrvbynm \ > + getsrvbynm_r \ > + getsrvbypt \ > + getsrvbypt_r \ > + # routines > + > +ifeq ($(have-thread-library),yes) > +CFLAGS-getservent_r.c += -fexceptions > +CFLAGS-getservent.c += -fexceptions > +endif > + > # shadow routines > routines += \ > fgetspent \ > diff --git a/nss/Versions b/nss/Versions > index b7491154bf..d8c4e373c9 100644 > --- a/nss/Versions > +++ b/nss/Versions > @@ -32,6 +32,8 @@ libc { > getpw; getpwent; getpwent_r; getpwnam; getpwnam_r; getpwuid; getpwuid_r; > getrpcbyname; getrpcbyname_r; getrpcbynumber; getrpcbynumber_r; > getrpcent; getrpcent_r; > + getservbyname; getservbyname_r; getservbyport; > + getservbyport_r; getservent; getservent_r; > getspent; getspent_r; getspnam; getspnam_r; > > # i* > @@ -64,6 +66,7 @@ libc { > getnetgrent_r; > getprotobyname_r; getprotobynumber_r; getprotoent_r; > getpwent_r; getpwuid_r; getpwnam_r; > + getservbyname_r; getservbyport_r; getservent_r; > getspent_r; getspnam_r; > } > GLIBC_2.2.2 { > diff --git a/inet/getservent.c b/nss/getservent.c > similarity index 100% > rename from inet/getservent.c > rename to nss/getservent.c > diff --git a/inet/getservent_r.c b/nss/getservent_r.c > similarity index 100% > rename from inet/getservent_r.c > rename to nss/getservent_r.c > diff --git a/inet/getsrvbynm.c b/nss/getsrvbynm.c > similarity index 100% > rename from inet/getsrvbynm.c > rename to nss/getsrvbynm.c > diff --git a/inet/getsrvbynm_r.c b/nss/getsrvbynm_r.c > similarity index 100% > rename from inet/getsrvbynm_r.c > rename to nss/getsrvbynm_r.c > diff --git a/inet/getsrvbypt.c b/nss/getsrvbypt.c > similarity index 100% > rename from inet/getsrvbypt.c > rename to nss/getsrvbypt.c > diff --git a/inet/getsrvbypt_r.c b/nss/getsrvbypt_r.c > similarity index 100% > rename from inet/getsrvbypt_r.c > rename to nss/getsrvbypt_r.c