From bda7947ecc576646e03d95a42d1cba2c58f721a7 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 27 Dec 2024 23:14:29 +0100 Subject: [PATCH] Rename module netdb to netdb-h. * modules/netdb-h: Renamed from modules/netdb. * modules/netdb-h-tests: Renamed from modules/netdb-tests. * modules/netdb-h-c++-tests: Renamed from modules/netdb-c++-tests. * tests/test-netdb-h.c: Renamed from tests/test-netdb.c. * tests/test-netdb-h-c++.cc: Renamed from tests/test-netdb-c++.cc. * doc/posix-headers/netdb.texi: Update. * modules/* (Depends-on): Update. * modules/netdb: New file. --- ChangeLog | 12 ++++ doc/posix-headers/netdb.texi | 4 +- modules/getaddrinfo | 2 +- modules/getdomainname | 2 +- modules/netdb | 46 +++------------ modules/netdb-c++-tests | 19 ------- modules/netdb-h | 57 +++++++++++++++++++ modules/netdb-h-c++-tests | 19 +++++++ modules/netdb-h-tests | 12 ++++ modules/netdb-tests | 12 ---- modules/posixcheck | 2 +- ...{test-netdb-c++.cc => test-netdb-h-c++.cc} | 0 tests/{test-netdb.c => test-netdb-h.c} | 0 13 files changed, 112 insertions(+), 75 deletions(-) delete mode 100644 modules/netdb-c++-tests create mode 100644 modules/netdb-h create mode 100644 modules/netdb-h-c++-tests create mode 100644 modules/netdb-h-tests delete mode 100644 modules/netdb-tests rename tests/{test-netdb-c++.cc => test-netdb-h-c++.cc} (100%) rename tests/{test-netdb.c => test-netdb-h.c} (100%) diff --git a/ChangeLog b/ChangeLog index b7aca0d7fe..12ae4c74bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2024-12-27 Bruno Haible + + Rename module netdb to netdb-h. + * modules/netdb-h: Renamed from modules/netdb. + * modules/netdb-h-tests: Renamed from modules/netdb-tests. + * modules/netdb-h-c++-tests: Renamed from modules/netdb-c++-tests. + * tests/test-netdb-h.c: Renamed from tests/test-netdb.c. + * tests/test-netdb-h-c++.cc: Renamed from tests/test-netdb-c++.cc. + * doc/posix-headers/netdb.texi: Update. + * modules/* (Depends-on): Update. + * modules/netdb: New file. + 2024-12-27 Bruno Haible Rename module monetary to monetary-h. diff --git a/doc/posix-headers/netdb.texi b/doc/posix-headers/netdb.texi index a655542717..aaaf05b23f 100644 --- a/doc/posix-headers/netdb.texi +++ b/doc/posix-headers/netdb.texi @@ -3,8 +3,8 @@ POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/netdb.h.html} -Gnulib module: netdb -@mindex netdb +Gnulib module: netdb-h +@mindex netdb-h Portability problems fixed by Gnulib: @itemize diff --git a/modules/getaddrinfo b/modules/getaddrinfo index 31b648734e..bdb6915e9f 100644 --- a/modules/getaddrinfo +++ b/modules/getaddrinfo @@ -7,7 +7,7 @@ lib/gai_strerror.c m4/getaddrinfo.m4 Depends-on: -netdb +netdb-h sys_socket extensions gettext-h [test $HAVE_GETADDRINFO = 0 || test $REPLACE_GETADDRINFO = 1 || test $HAVE_DECL_GAI_STRERROR = 0 || test $REPLACE_GAI_STRERROR = 1] diff --git a/modules/getdomainname b/modules/getdomainname index 1e21c90658..bf8bb3475b 100644 --- a/modules/getdomainname +++ b/modules/getdomainname @@ -8,7 +8,7 @@ m4/getdomainname.m4 Depends-on: unistd extensions -netdb [test $HAVE_DECL_GETDOMAINNAME = 0 || test $REPLACE_GETDOMAINNAME = 1] +netdb-h [test $HAVE_DECL_GETDOMAINNAME = 0 || test $REPLACE_GETDOMAINNAME = 1] sys_socket [test $HAVE_DECL_GETDOMAINNAME = 0 || test $REPLACE_GETDOMAINNAME = 1] configure.ac: diff --git a/modules/netdb b/modules/netdb index b81d389cd1..534da75fb2 100644 --- a/modules/netdb +++ b/modules/netdb @@ -1,51 +1,20 @@ Description: A for systems lacking it. +Status: +deprecated + +Notice: +This module is deprecated. Use the module 'netdb-h' instead. + Files: -lib/netdb.in.h -m4/netdb_h.m4 Depends-on: -gen-header -include_next -snippet/arg-nonnull -snippet/c++defs -snippet/warn-on-use -sys_socket +netdb-h configure.ac: -gl_NETDB_H -gl_NETDB_H_REQUIRE_DEFAULTS -AC_PROG_MKDIR_P Makefile.am: -BUILT_SOURCES += netdb.h - -# We need the following in order to create when the system -# doesn't have one that works with the given compiler. -netdb.h: netdb.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' - $(gl_V_at)$(SED_HEADER_STDOUT) \ - -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ - -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_NETDB_H''@|$(NEXT_NETDB_H)|g' \ - -e 's|@''HAVE_NETDB_H''@|$(HAVE_NETDB_H)|g' \ - -e 's/@''GNULIB_GETADDRINFO''@/$(GNULIB_GETADDRINFO)/g' \ - -e 's|@''HAVE_STRUCT_ADDRINFO''@|$(HAVE_STRUCT_ADDRINFO)|g' \ - -e 's|@''HAVE_DECL_FREEADDRINFO''@|$(HAVE_DECL_FREEADDRINFO)|g' \ - -e 's|@''HAVE_DECL_GAI_STRERROR''@|$(HAVE_DECL_GAI_STRERROR)|g' \ - -e 's|@''HAVE_DECL_GETADDRINFO''@|$(HAVE_DECL_GETADDRINFO)|g' \ - -e 's|@''HAVE_DECL_GETNAMEINFO''@|$(HAVE_DECL_GETNAMEINFO)|g' \ - -e 's|@''REPLACE_GAI_STRERROR''@|$(REPLACE_GAI_STRERROR)|g' \ - -e 's|@''REPLACE_GETADDRINFO''@|$(REPLACE_GETADDRINFO)|g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ - -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - $(srcdir)/netdb.in.h > $@-t - $(AM_V_at)mv $@-t $@ -MOSTLYCLEANFILES += netdb.h netdb.h-t Include: @@ -54,4 +23,3 @@ License: LGPLv2+ Maintainer: -Simon Josefsson diff --git a/modules/netdb-c++-tests b/modules/netdb-c++-tests deleted file mode 100644 index af07dee341..0000000000 --- a/modules/netdb-c++-tests +++ /dev/null @@ -1,19 +0,0 @@ -Files: -tests/test-netdb-c++.cc -tests/signature.h - -Status: -c++-test - -Depends-on: -ansi-c++-opt - -configure.ac: - -Makefile.am: -if ANSICXX -TESTS += test-netdb-c++ -check_PROGRAMS += test-netdb-c++ -test_netdb_c___SOURCES = test-netdb-c++.cc -test_netdb_c___LDADD = $(LDADD) $(GETADDRINFO_LIB) -endif diff --git a/modules/netdb-h b/modules/netdb-h new file mode 100644 index 0000000000..b81d389cd1 --- /dev/null +++ b/modules/netdb-h @@ -0,0 +1,57 @@ +Description: +A for systems lacking it. + +Files: +lib/netdb.in.h +m4/netdb_h.m4 + +Depends-on: +gen-header +include_next +snippet/arg-nonnull +snippet/c++defs +snippet/warn-on-use +sys_socket + +configure.ac: +gl_NETDB_H +gl_NETDB_H_REQUIRE_DEFAULTS +AC_PROG_MKDIR_P + +Makefile.am: +BUILT_SOURCES += netdb.h + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +netdb.h: netdb.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_STDOUT) \ + -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ + -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_NETDB_H''@|$(NEXT_NETDB_H)|g' \ + -e 's|@''HAVE_NETDB_H''@|$(HAVE_NETDB_H)|g' \ + -e 's/@''GNULIB_GETADDRINFO''@/$(GNULIB_GETADDRINFO)/g' \ + -e 's|@''HAVE_STRUCT_ADDRINFO''@|$(HAVE_STRUCT_ADDRINFO)|g' \ + -e 's|@''HAVE_DECL_FREEADDRINFO''@|$(HAVE_DECL_FREEADDRINFO)|g' \ + -e 's|@''HAVE_DECL_GAI_STRERROR''@|$(HAVE_DECL_GAI_STRERROR)|g' \ + -e 's|@''HAVE_DECL_GETADDRINFO''@|$(HAVE_DECL_GETADDRINFO)|g' \ + -e 's|@''HAVE_DECL_GETNAMEINFO''@|$(HAVE_DECL_GETNAMEINFO)|g' \ + -e 's|@''REPLACE_GAI_STRERROR''@|$(REPLACE_GAI_STRERROR)|g' \ + -e 's|@''REPLACE_GETADDRINFO''@|$(REPLACE_GETADDRINFO)|g' \ + -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ + -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ + $(srcdir)/netdb.in.h > $@-t + $(AM_V_at)mv $@-t $@ +MOSTLYCLEANFILES += netdb.h netdb.h-t + +Include: + + +License: +LGPLv2+ + +Maintainer: +Simon Josefsson diff --git a/modules/netdb-h-c++-tests b/modules/netdb-h-c++-tests new file mode 100644 index 0000000000..d211c62faa --- /dev/null +++ b/modules/netdb-h-c++-tests @@ -0,0 +1,19 @@ +Files: +tests/test-netdb-h-c++.cc +tests/signature.h + +Status: +c++-test + +Depends-on: +ansi-c++-opt + +configure.ac: + +Makefile.am: +if ANSICXX +TESTS += test-netdb-h-c++ +check_PROGRAMS += test-netdb-h-c++ +test_netdb_h_c___SOURCES = test-netdb-h-c++.cc +test_netdb_h_c___LDADD = $(LDADD) $(GETADDRINFO_LIB) +endif diff --git a/modules/netdb-h-tests b/modules/netdb-h-tests new file mode 100644 index 0000000000..fdc06e91c5 --- /dev/null +++ b/modules/netdb-h-tests @@ -0,0 +1,12 @@ +Files: +tests/test-netdb-h.c + +Depends-on: +netdb-h-c++-tests +assert-h + +configure.ac: + +Makefile.am: +TESTS += test-netdb-h +check_PROGRAMS += test-netdb-h diff --git a/modules/netdb-tests b/modules/netdb-tests deleted file mode 100644 index 2f84ec360e..0000000000 --- a/modules/netdb-tests +++ /dev/null @@ -1,12 +0,0 @@ -Files: -tests/test-netdb.c - -Depends-on: -netdb-c++-tests -assert-h - -configure.ac: - -Makefile.am: -TESTS += test-netdb -check_PROGRAMS += test-netdb diff --git a/modules/posixcheck b/modules/posixcheck index 3c04ecc4d4..9cf7f3340c 100644 --- a/modules/posixcheck +++ b/modules/posixcheck @@ -20,7 +20,7 @@ locale-h malloc-h math-h monetary-h -netdb +netdb-h poll-h pthread-h pty diff --git a/tests/test-netdb-c++.cc b/tests/test-netdb-h-c++.cc similarity index 100% rename from tests/test-netdb-c++.cc rename to tests/test-netdb-h-c++.cc diff --git a/tests/test-netdb.c b/tests/test-netdb-h.c similarity index 100% rename from tests/test-netdb.c rename to tests/test-netdb-h.c