From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2012) id 0E9373858423; Tue, 24 Oct 2023 10:33:37 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0E9373858423 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1698143617; bh=I+tZAqJGO1MEb+PBo9Q84zjddT4AUm64aNXfl0DEn4k=; h=From:To:Subject:Date:From; b=talsHYEudxw1wnMwtp9w5r/3IPiImJApjboWcyc5wDnadXbCQRVP0W8568oPEVBBx mVizfbyOcwUZQAA+FkYVchK1JA/DJ6N3tF8y4EDpltqzpf5ki+kHSTLURgeDkqv53R k6ZZFafJZ+upt/M77TVl9vFgqAZFpsloJ8a7VsgA= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Arjun Shankar To: glibc-cvs@sourceware.org Subject: [glibc] Move 'ethers' routines from 'inet' into 'nss' X-Act-Checkin: glibc X-Git-Author: Arjun Shankar X-Git-Refname: refs/heads/master X-Git-Oldrev: 4298586619e4a8cf4ba0a5a9da31ae80efac173c X-Git-Newrev: 1c40266328babd3613d0fc7928449a7b53d87c73 Message-Id: <20231024103337.0E9373858423@sourceware.org> Date: Tue, 24 Oct 2023 10:33:37 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=1c40266328babd3613d0fc7928449a7b53d87c73 commit 1c40266328babd3613d0fc7928449a7b53d87c73 Author: Arjun Shankar Date: Mon Oct 2 14:55:20 2023 +0200 Move 'ethers' routines from 'inet' into 'nss' 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. Reviewed-by: Adhemerval Zanella Diff: --- 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(-) 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. */