[08/16] Move 'ethers' routines from 'inet' into 'nss'
Checks
Context |
Check |
Description |
redhat-pt-bot/TryBot-apply_patch |
success
|
Patch applied to master at the time it was sent
|
linaro-tcwg-bot/tcwg_glibc_build--master-arm |
success
|
Testing passed
|
linaro-tcwg-bot/tcwg_glibc_build--master-aarch64 |
success
|
Testing passed
|
linaro-tcwg-bot/tcwg_glibc_check--master-aarch64 |
success
|
Testing passed
|
linaro-tcwg-bot/tcwg_glibc_check--master-arm |
fail
|
Testing failed
|
Commit Message
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.
---
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%)
Comments
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 <adhemerval.zanella@linaro.org>
> ---
> 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 <netinet/if_ether.h>
> #include <string.h>
>
> -#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 <netinet/if_ether.h>
> #include <string.h>
>
> -#include <nss/nsswitch.h>
> +#include <nsswitch.h>
>
>
> /* Type of the lookup function we need here. */
@@ -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 \
@@ -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;
@@ -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 \
@@ -10,6 +10,7 @@ libc {
endgrent;
endpwent;
endspent;
+ ether_hostton; ether_ntohost;
# f*
fgetgrent; fgetgrent_r;
similarity index 98%
rename from inet/ether_hton.c
rename to nss/ether_hton.c
@@ -20,7 +20,7 @@
#include <netinet/if_ether.h>
#include <string.h>
-#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,
similarity index 98%
rename from inet/ether_ntoh.c
rename to nss/ether_ntoh.c
@@ -20,7 +20,7 @@
#include <netinet/if_ether.h>
#include <string.h>
-#include <nss/nsswitch.h>
+#include <nsswitch.h>
/* Type of the lookup function we need here. */