[16/16] Move getnameinfo from 'inet' to '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
|
| redhat-pt-bot/TryBot-32bit |
success
|
Build for i686
|
| linaro-tcwg-bot/tcwg_glibc_build--master-aarch64 |
success
|
Testing passed
|
| linaro-tcwg-bot/tcwg_glibc_check--master-arm |
fail
|
Testing failed
|
| linaro-tcwg-bot/tcwg_glibc_check--master-aarch64 |
success
|
Testing passed
|
Commit Message
getnameinfo is an entry points for nss functionality. This commit moves
it from the 'inet' subdirectory to 'nss'. The corresponding Versions
entry is also moved from 'posix' into 'nss'.
---
inet/Makefile | 1 -
nss/Makefile | 1 +
nss/Versions | 3 +++
{inet => nss}/getnameinfo.c | 2 +-
posix/Versions | 2 +-
5 files changed, 6 insertions(+), 3 deletions(-)
rename {inet => nss}/getnameinfo.c (99%)
Comments
On 02/10/23 09:55, Arjun Shankar wrote:
> getnameinfo is an entry points for nss functionality. This commit moves
> it from the 'inet' subdirectory to 'nss'. The corresponding Versions
> entry is also moved from 'posix' into 'nss'.
LGTM, thanks.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
> ---
> inet/Makefile | 1 -
> nss/Makefile | 1 +
> nss/Versions | 3 +++
> {inet => nss}/getnameinfo.c | 2 +-
> posix/Versions | 2 +-
> 5 files changed, 6 insertions(+), 3 deletions(-)
> rename {inet => nss}/getnameinfo.c (99%)
>
> diff --git a/inet/Makefile b/inet/Makefile
> index d275f51b3f..b691fef921 100644
> --- a/inet/Makefile
> +++ b/inet/Makefile
> @@ -47,7 +47,6 @@ routines := \
> ether_ntoa \
> ether_ntoa_r \
> getipv4sourcefilter \
> - getnameinfo \
> getsourcefilter \
> herrno \
> herrno-loc \
> diff --git a/nss/Makefile b/nss/Makefile
> index da5bd207aa..213b68720b 100644
> --- a/nss/Makefile
> +++ b/nss/Makefile
> @@ -136,6 +136,7 @@ routines += \
> gethstbynm_r \
> gethstent \
> gethstent_r \
> + getnameinfo \
> # routines
>
> ifeq ($(have-thread-library),yes)
> diff --git a/nss/Versions b/nss/Versions
> index 158a9175a4..d765e1d3b6 100644
> --- a/nss/Versions
> +++ b/nss/Versions
> @@ -58,6 +58,9 @@ libc {
> ulckpwdf;
> }
> GLIBC_2.1 {
> + # g*
> + getnameinfo;
> +
> # p*
> putgrent;
> }
> diff --git a/inet/getnameinfo.c b/nss/getnameinfo.c
> similarity index 99%
> rename from inet/getnameinfo.c
> rename to nss/getnameinfo.c
> index 40c20b4be6..062652c229 100644
> --- a/inet/getnameinfo.c
> +++ b/nss/getnameinfo.c
> @@ -71,7 +71,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> #include <sys/utsname.h>
> #include <libc-lock.h>
> #include <scratch_buffer.h>
> -#include <net-internal.h>
> +#include <inet/net-internal.h>
> #include <set-freeres.h>
>
> #ifndef min
> diff --git a/posix/Versions b/posix/Versions
> index b24c7c87ff..0624d24bcc 100644
> --- a/posix/Versions
> +++ b/posix/Versions
> @@ -72,7 +72,7 @@ libc {
> __pread64; __pwrite64;
>
> # g*
> - gai_strerror; getnameinfo; glob64; globfree64;
> + gai_strerror; glob64; globfree64;
>
> # p*
> pread; pread64; pwrite; pwrite64;
@@ -47,7 +47,6 @@ routines := \
ether_ntoa \
ether_ntoa_r \
getipv4sourcefilter \
- getnameinfo \
getsourcefilter \
herrno \
herrno-loc \
@@ -136,6 +136,7 @@ routines += \
gethstbynm_r \
gethstent \
gethstent_r \
+ getnameinfo \
# routines
ifeq ($(have-thread-library),yes)
@@ -58,6 +58,9 @@ libc {
ulckpwdf;
}
GLIBC_2.1 {
+ # g*
+ getnameinfo;
+
# p*
putgrent;
}
similarity index 99%
rename from inet/getnameinfo.c
rename to nss/getnameinfo.c
@@ -71,7 +71,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <sys/utsname.h>
#include <libc-lock.h>
#include <scratch_buffer.h>
-#include <net-internal.h>
+#include <inet/net-internal.h>
#include <set-freeres.h>
#ifndef min
@@ -72,7 +72,7 @@ libc {
__pread64; __pwrite64;
# g*
- gai_strerror; getnameinfo; glob64; globfree64;
+ gai_strerror; glob64; globfree64;
# p*
pread; pread64; pwrite; pwrite64;