From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [IPv6:2607:f8b0:4864:20::62e]) by sourceware.org (Postfix) with ESMTPS id 588963858D28 for ; Thu, 19 Oct 2023 19:39:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 588963858D28 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 588963858D28 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::62e ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1697744375; cv=none; b=dGkepblLYplM/JAXHmeqJGCI+ZhAylCk3KrTJNhMM/8pu2KeFHnJMVMmXpQA8dgcVqQ0+b0ArwOKV/J6J23if1jfYtJ1a7PsrVHOGtmioGv5Zskw9fuu0XiwpNYNbHoLcBrvKg1BcMGdHWdkdwG9WH7R7V0NlnxejWBwjH1SHOM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1697744375; c=relaxed/simple; bh=JoXwTDmzzE3tEQIEH69AEyFP5RgELUVMCIeRS8eqZ5U=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:To:From; b=frNP0NrnJd/boHyRVXYedsj3yx0aLKFW8blJE4gzyvrm3jytHa3JTCF8FnbpL1cqn+Obq2DvWkfElfqnazA+++8lXs6IazS9d2GUdltt0jJxP8ZIRN7TtCxEj6VIU51e9aR7YAJSZgAaiWGbX27duPo0MsyUBbt/rTk/laqXxyQ= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-1ca052ec63bso198485ad.1 for ; Thu, 19 Oct 2023 12:39:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697744372; x=1698349172; 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=Ne4OgC2lhPvByJqUJwwhJI5fw4E9Anhr8nur032+GxM=; b=U8TxjOcVuSqooF30ld0qV/rMJJ0JeTzdtrK2a6SV5CRAEA2l8ry4ENwUYjDv3iI0mW 02uPKxwcBiP0I0matx6cEX4OB6J7UE04Xids5I80jpsyByRwj5IaLgmPwALCQ1y3Z/GR itW86tlfUXJ3HzmjRQ38DHyUCus+J5XbeDshzvGT8IMi1ms865RHPVGzgLQ9VeTDq2tT JvbxcErVe9hMwcnV5KVz/VED6vSCpXy+cF1Ko0bz/sv+gu01K/3/ciJ8QUkdAsIgEYgL Jza/7oqPQcTTnC1FoiuqXKMkVKNlu+D5faqkoupIqJivU/uQYX+F8uuRFC2+Iu54spMW YyAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697744372; x=1698349172; 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=Ne4OgC2lhPvByJqUJwwhJI5fw4E9Anhr8nur032+GxM=; b=PK9NTRCNbuPQdERuH1dptbOK8zwAXcyBfxCP0vMfx6WJ0whCOIANHrL1374hGwyrzq G6jowaQkYL7AX+qHuBTkjD5hwDaODc/Z26JPn/T1L5+GNJAZdfX6kVgNoYEIfpinYfTE bwi+9dZtjlpIQ9QcdnfcVbeTCR1vivzWXmSdq8/hPmtCu7JRuOOFqA8XRFfnfEk9HDqv WfyyBIPwbDSnaFtvdLw3lpHlQcyPXQah1AEC/FI8qKl3zqBdggGReCLa1cYauB2h25be YXw6lsIuIdhvIVKGDWPqnf4/ByeFVVTeyJr4lLShGv/hs0ZyNH08yxBGgMKrP+raYEhs f0Ag== X-Gm-Message-State: AOJu0YwHpzu/E3XH4aGBGOepIMfei8DG5iFHXqIrURqnQ1DiGWUsOeAa 4pTPRDhSSiLchrlzURCNcFtpx/k9+a9PqxxpilTcXw== X-Google-Smtp-Source: AGHT+IE4yPOuMZw+UN+6MbjpRJpQsVWIgxMjM7sDjLdBqWqzhCeUB2ehiB3jMxYS90ITIrxZ6gVtGA== X-Received: by 2002:a17:902:e88c:b0:1c6:17a4:afae with SMTP id w12-20020a170902e88c00b001c617a4afaemr4312952plg.4.1697744372279; Thu, 19 Oct 2023 12:39:32 -0700 (PDT) Received: from ?IPV6:2804:1b3:a7c3:a647:51c8:7d15:99b:dc36? ([2804:1b3:a7c3:a647:51c8:7d15:99b:dc36]) by smtp.gmail.com with ESMTPSA id jb12-20020a170903258c00b001c46d04d001sm86389plb.87.2023.10.19.12.39.30 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 19 Oct 2023 12:39:31 -0700 (PDT) Message-ID: <0a14bbd7-ccd5-4a1c-a55d-c44e512c1c5b@linaro.org> Date: Thu, 19 Oct 2023 16:39:28 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 08/16] Move 'ethers' 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-9-arjun@redhat.com> From: Adhemerval Zanella Netto Organization: Linaro In-Reply-To: <20231002130150.1497733-9-arjun@redhat.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.3 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: > ether_hostton and ether_ntohost are entry points for nss functionality. > This commit moves them from the 'inet' subdirectory to 'nss', and > adjusts any references accordingly. LGTM, thanks. Reviewed-by: Adhemerval Zanella > --- > inet/Makefile | 2 -- > inet/Versions | 4 ++-- > nss/Makefile | 6 ++++++ > nss/Versions | 1 + > {inet => nss}/ether_hton.c | 2 +- > {inet => nss}/ether_ntoh.c | 2 +- > 6 files changed, 11 insertions(+), 6 deletions(-) > rename {inet => nss}/ether_hton.c (98%) > rename {inet => nss}/ether_ntoh.c (98%) > > diff --git a/inet/Makefile b/inet/Makefile > index bd3dc58322..4d053de748 100644 > --- a/inet/Makefile > +++ b/inet/Makefile > @@ -43,11 +43,9 @@ routines := \ > deadline \ > ether_aton \ > ether_aton_r \ > - ether_hton \ > ether_line \ > ether_ntoa \ > ether_ntoa_r \ > - ether_ntoh \ > gethstbyad \ > gethstbyad_r \ > gethstbynm \ > diff --git a/inet/Versions b/inet/Versions > index e6d1e6f1ba..a7c1a0fb6f 100644 > --- a/inet/Versions > +++ b/inet/Versions > @@ -10,8 +10,8 @@ libc { > endaliasent; endhostent; endnetent; endnetgrent; endprotoent; endservent; > > # e* > - ether_aton; ether_aton_r; ether_hostton; ether_line; ether_ntoa; > - ether_ntoa_r; ether_ntohost; > + ether_aton; ether_aton_r; ether_line; ether_ntoa; > + ether_ntoa_r; > > # g* > getdomainname; gethostbyaddr; gethostbyaddr_r; gethostbyname; > diff --git a/nss/Makefile b/nss/Makefile > index 2dfa7ebef9..148c6dc1cf 100644 > --- a/nss/Makefile > +++ b/nss/Makefile > @@ -68,6 +68,12 @@ CFLAGS-getaliasent_r.c += -fexceptions > CFLAGS-getaliasent.c += -fexceptions > endif > > +# ethers routines: > +routines += \ > + ether_hton \ > + ether_ntoh \ > + # routines > + > # grp routines: > routines += \ > fgetgrent \ > diff --git a/nss/Versions b/nss/Versions > index 5d1b1dac3d..99208cb9df 100644 > --- a/nss/Versions > +++ b/nss/Versions > @@ -10,6 +10,7 @@ libc { > endgrent; > endpwent; > endspent; > + ether_hostton; ether_ntohost; > > # f* > fgetgrent; fgetgrent_r; > diff --git a/inet/ether_hton.c b/nss/ether_hton.c > similarity index 98% > rename from inet/ether_hton.c > rename to nss/ether_hton.c > index 1b49a57f48..5419464756 100644 > --- a/inet/ether_hton.c > +++ b/nss/ether_hton.c > @@ -20,7 +20,7 @@ > #include > #include > > -#include "../nss/nsswitch.h" > +#include "nsswitch.h" > > /* Type of the lookup function we need here. */ > typedef int (*lookup_function) (const char *, struct etherent *, char *, int, > diff --git a/inet/ether_ntoh.c b/nss/ether_ntoh.c > similarity index 98% > rename from inet/ether_ntoh.c > rename to nss/ether_ntoh.c > index 9f9d7c1a63..2f1eb4ec3d 100644 > --- a/inet/ether_ntoh.c > +++ b/nss/ether_ntoh.c > @@ -20,7 +20,7 @@ > #include > #include > > -#include > +#include > > > /* Type of the lookup function we need here. */