]> Savannah Git Hosting - gnulib.git/commitdiff
Rename module netdb to netdb-h.
authorBruno Haible <bruno@clisp.org>
Fri, 27 Dec 2024 22:14:29 +0000 (23:14 +0100)
committerBruno Haible <bruno@clisp.org>
Fri, 27 Dec 2024 22:14:29 +0000 (23:14 +0100)
* 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.

15 files changed:
ChangeLog
doc/posix-headers/netdb.texi
modules/getaddrinfo
modules/getdomainname
modules/netdb
modules/netdb-c++-tests [deleted file]
modules/netdb-h [new file with mode: 0644]
modules/netdb-h-c++-tests [new file with mode: 0644]
modules/netdb-h-tests [new file with mode: 0644]
modules/netdb-tests [deleted file]
modules/posixcheck
tests/test-netdb-c++.cc [deleted file]
tests/test-netdb-h-c++.cc [new file with mode: 0644]
tests/test-netdb-h.c [new file with mode: 0644]
tests/test-netdb.c [deleted file]

index b7aca0d7fe4dcb31e613d84ac067caef4b290380..12ae4c74bc2b73d51058b6315345700a4ad76502 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2024-12-27  Bruno Haible  <bruno@clisp.org>
+
+       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  <bruno@clisp.org>
 
        Rename module monetary to monetary-h.
index a6555427176535a0bcdd18cd5126e4f21116aecb..aaaf05b23fc4b9f6ab5cf1334fc45a31e7422f79 100644 (file)
@@ -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
index 31b648734e6d408690ce12f6c5f237aebfa6f918..bdb6915e9f771eac19c56557ca51f05dc3759860 100644 (file)
@@ -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]
index 1e21c906583a4ee8891876017224cdb5288ae524..bf8bb3475b00f015b80c227b2fce0d81b0832b68 100644 (file)
@@ -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:
index b81d389cd173bad69dde799d53b9b710a63209dd..534da75fb2e001f328295c29a68fae33b5a6bc6e 100644 (file)
@@ -1,51 +1,20 @@
 Description:
 A <netdb.h> 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 <netdb.h> 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:
 <netdb.h>
@@ -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 (file)
index af07dee..0000000
+++ /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 (file)
index 0000000..b81d389
--- /dev/null
@@ -0,0 +1,57 @@
+Description:
+A <netdb.h> 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 <netdb.h> 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:
+<netdb.h>
+
+License:
+LGPLv2+
+
+Maintainer:
+Simon Josefsson
diff --git a/modules/netdb-h-c++-tests b/modules/netdb-h-c++-tests
new file mode 100644 (file)
index 0000000..d211c62
--- /dev/null
@@ -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 (file)
index 0000000..fdc06e9
--- /dev/null
@@ -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 (file)
index 2f84ec3..0000000
+++ /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
index 3c04ecc4d493f063c6cf5dfd851ed44e49614070..9cf7f3340c8f941e16ad3075085b5ba5136acd79 100644 (file)
@@ -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-c++.cc
deleted file mode 100644 (file)
index 5f536be..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Test of <netdb.h> substitute in C++ mode.
-   Copyright (C) 2011-2024 Free Software Foundation, Inc.
-
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
-
-/* Written by Bruno Haible <bruno@clisp.org>, 2011.  */
-
-#define GNULIB_NAMESPACE gnulib
-#include <config.h>
-
-#include <netdb.h>
-
-#include "signature.h"
-
-
-#if GNULIB_TEST_GETADDRINFO
-SIGNATURE_CHECK (GNULIB_NAMESPACE::getaddrinfo, int,
-                 (const char *, const char *, const struct addrinfo *,
-                  struct addrinfo **));
-SIGNATURE_CHECK (GNULIB_NAMESPACE::freeaddrinfo, void, (struct addrinfo *));
-SIGNATURE_CHECK (GNULIB_NAMESPACE::gai_strerror, const char *, (int));
-SIGNATURE_CHECK (GNULIB_NAMESPACE::getnameinfo, int,
-                 (const struct sockaddr *, socklen_t, char *, socklen_t,
-                  char *, socklen_t, int));
-#endif
-
-
-int
-main ()
-{
-}
diff --git a/tests/test-netdb-h-c++.cc b/tests/test-netdb-h-c++.cc
new file mode 100644 (file)
index 0000000..5f536be
--- /dev/null
@@ -0,0 +1,42 @@
+/* Test of <netdb.h> substitute in C++ mode.
+   Copyright (C) 2011-2024 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2011.  */
+
+#define GNULIB_NAMESPACE gnulib
+#include <config.h>
+
+#include <netdb.h>
+
+#include "signature.h"
+
+
+#if GNULIB_TEST_GETADDRINFO
+SIGNATURE_CHECK (GNULIB_NAMESPACE::getaddrinfo, int,
+                 (const char *, const char *, const struct addrinfo *,
+                  struct addrinfo **));
+SIGNATURE_CHECK (GNULIB_NAMESPACE::freeaddrinfo, void, (struct addrinfo *));
+SIGNATURE_CHECK (GNULIB_NAMESPACE::gai_strerror, const char *, (int));
+SIGNATURE_CHECK (GNULIB_NAMESPACE::getnameinfo, int,
+                 (const struct sockaddr *, socklen_t, char *, socklen_t,
+                  char *, socklen_t, int));
+#endif
+
+
+int
+main ()
+{
+}
diff --git a/tests/test-netdb-h.c b/tests/test-netdb-h.c
new file mode 100644 (file)
index 0000000..471ad79
--- /dev/null
@@ -0,0 +1,36 @@
+/* Test of <netdb.h> substitute.
+   Copyright (C) 2007-2008, 2010-2024 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+/* Written by Simon Josefsson <simon@josefsson.org>, 2008.  */
+
+#include <config.h>
+
+#include <netdb.h>
+
+static_assert (NI_MAXHOST == 1025);
+static_assert (NI_MAXSERV == 32);
+
+/* Check that the 'struct hostent' type is defined.  */
+struct hostent t1;
+
+/* Check that the 'socklen_t' type is defined.  */
+socklen_t t2;
+
+int
+main (void)
+{
+  return 0;
+}
diff --git a/tests/test-netdb.c b/tests/test-netdb.c
deleted file mode 100644 (file)
index 471ad79..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Test of <netdb.h> substitute.
-   Copyright (C) 2007-2008, 2010-2024 Free Software Foundation, Inc.
-
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
-
-/* Written by Simon Josefsson <simon@josefsson.org>, 2008.  */
-
-#include <config.h>
-
-#include <netdb.h>
-
-static_assert (NI_MAXHOST == 1025);
-static_assert (NI_MAXSERV == 32);
-
-/* Check that the 'struct hostent' type is defined.  */
-struct hostent t1;
-
-/* Check that the 'socklen_t' type is defined.  */
-socklen_t t2;
-
-int
-main (void)
-{
-  return 0;
-}