From: Bruno Haible <bruno@clisp.org>
Date: Fri, 27 Dec 2024 22:41:41 +0000 (+0100)
Subject: Rename module sys_uio to sys_uio-h.
X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=f00725c3350278ed6312043adf65794e400cc261;p=gnulib.git

Rename module sys_uio to sys_uio-h.

* modules/sys_uio-h: Renamed from modules/sys_uio.
* modules/sys_uio-h-tests: Renamed from modules/sys_uio-tests.
* modules/sys_uio-h-c++-tests: Renamed from modules/sys_uio-c++-tests.
* tests/test-sys_uio-h.c: Renamed from tests/test-sys_uio.c.
* tests/test-sys_uio-h-c++.cc: Renamed from tests/test-sys_uio-c++.cc.
* doc/posix-headers/sys_uio.texi: Update.
* modules/* (Depends-on): Update.
* modules/sys_uio: New file.
---

diff --git a/ChangeLog b/ChangeLog
index f586960adc..b4fcea1b77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2024-12-27  Bruno Haible  <bruno@clisp.org>
+
+	Rename module sys_uio to sys_uio-h.
+	* modules/sys_uio-h: Renamed from modules/sys_uio.
+	* modules/sys_uio-h-tests: Renamed from modules/sys_uio-tests.
+	* modules/sys_uio-h-c++-tests: Renamed from modules/sys_uio-c++-tests.
+	* tests/test-sys_uio-h.c: Renamed from tests/test-sys_uio.c.
+	* tests/test-sys_uio-h-c++.cc: Renamed from tests/test-sys_uio-c++.cc.
+	* doc/posix-headers/sys_uio.texi: Update.
+	* modules/* (Depends-on): Update.
+	* modules/sys_uio: New file.
+
 2024-12-27  Bruno Haible  <bruno@clisp.org>
 
 	Rename module sys_types to sys_types-h.
diff --git a/doc/posix-headers/sys_uio.texi b/doc/posix-headers/sys_uio.texi
index 9be709565e..a83c454305 100644
--- a/doc/posix-headers/sys_uio.texi
+++ b/doc/posix-headers/sys_uio.texi
@@ -3,8 +3,8 @@
 
 POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sys_uio.h.html}
 
-Gnulib module: sys_uio
-@mindex sys_uio
+Gnulib module: sys_uio-h
+@mindex sys_uio-h
 
 Portability problems fixed by Gnulib:
 @itemize
diff --git a/modules/sys_socket-h b/modules/sys_socket-h
index bbd337f789..684df00a84 100644
--- a/modules/sys_socket-h
+++ b/modules/sys_socket-h
@@ -18,7 +18,7 @@ snippet/c++defs
 snippet/warn-on-use
 socklen
 ssize_t
-sys_uio
+sys_uio-h
 
 configure.ac:
 gl_SYS_SOCKET_H
diff --git a/modules/sys_uio b/modules/sys_uio
index 391e232702..1f8480bcb6 100644
--- a/modules/sys_uio
+++ b/modules/sys_uio
@@ -1,39 +1,20 @@
 Description:
 A POSIX-like <sys/uio.h>.
 
+Status:
+deprecated
+
+Notice:
+This module is deprecated. Use the module 'sys_uio-h' instead.
+
 Files:
-lib/sys_uio.in.h
-m4/sys_uio_h.m4
 
 Depends-on:
-gen-header
-include_next
-ssize_t
-sys_types-h
+sys_uio-h
 
 configure.ac:
-gl_SYS_UIO_H
-gl_SYS_UIO_H_REQUIRE_DEFAULTS
-AC_PROG_MKDIR_P
 
 Makefile.am:
-BUILT_SOURCES += sys/uio.h
-
-# We need the following in order to create <sys/uio.h> when the system
-# doesn't have one that works with the given compiler.
-sys/uio.h: sys_uio.in.h $(top_builddir)/config.status
-	$(AM_V_GEN)$(MKDIR_P) '%reldir%/sys'
-	$(AM_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_SYS_UIO_H''@|$(NEXT_SYS_UIO_H)|g' \
-	      -e 's|@''HAVE_SYS_UIO_H''@|$(HAVE_SYS_UIO_H)|g' \
-	      $(srcdir)/sys_uio.in.h > $@-t
-	$(AM_V_at)mv $@-t $@
-MOSTLYCLEANFILES += sys/uio.h sys/uio.h-t
-MOSTLYCLEANDIRS += sys
 
 Include:
 <sys/uio.h>
@@ -42,4 +23,3 @@ License:
 LGPLv2+
 
 Maintainer:
-Eric Blake
diff --git a/modules/sys_uio-c++-tests b/modules/sys_uio-c++-tests
deleted file mode 100644
index 15765d8419..0000000000
--- a/modules/sys_uio-c++-tests
+++ /dev/null
@@ -1,17 +0,0 @@
-Files:
-tests/test-sys_uio-c++.cc
-
-Status:
-c++-test
-
-Depends-on:
-ansi-c++-opt
-
-configure.ac:
-
-Makefile.am:
-if ANSICXX
-TESTS += test-sys_uio-c++
-check_PROGRAMS += test-sys_uio-c++
-test_sys_uio_c___SOURCES = test-sys_uio-c++.cc
-endif
diff --git a/modules/sys_uio-h b/modules/sys_uio-h
new file mode 100644
index 0000000000..391e232702
--- /dev/null
+++ b/modules/sys_uio-h
@@ -0,0 +1,45 @@
+Description:
+A POSIX-like <sys/uio.h>.
+
+Files:
+lib/sys_uio.in.h
+m4/sys_uio_h.m4
+
+Depends-on:
+gen-header
+include_next
+ssize_t
+sys_types-h
+
+configure.ac:
+gl_SYS_UIO_H
+gl_SYS_UIO_H_REQUIRE_DEFAULTS
+AC_PROG_MKDIR_P
+
+Makefile.am:
+BUILT_SOURCES += sys/uio.h
+
+# We need the following in order to create <sys/uio.h> when the system
+# doesn't have one that works with the given compiler.
+sys/uio.h: sys_uio.in.h $(top_builddir)/config.status
+	$(AM_V_GEN)$(MKDIR_P) '%reldir%/sys'
+	$(AM_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_SYS_UIO_H''@|$(NEXT_SYS_UIO_H)|g' \
+	      -e 's|@''HAVE_SYS_UIO_H''@|$(HAVE_SYS_UIO_H)|g' \
+	      $(srcdir)/sys_uio.in.h > $@-t
+	$(AM_V_at)mv $@-t $@
+MOSTLYCLEANFILES += sys/uio.h sys/uio.h-t
+MOSTLYCLEANDIRS += sys
+
+Include:
+<sys/uio.h>
+
+License:
+LGPLv2+
+
+Maintainer:
+Eric Blake
diff --git a/modules/sys_uio-h-c++-tests b/modules/sys_uio-h-c++-tests
new file mode 100644
index 0000000000..fe24cb6a01
--- /dev/null
+++ b/modules/sys_uio-h-c++-tests
@@ -0,0 +1,17 @@
+Files:
+tests/test-sys_uio-h-c++.cc
+
+Status:
+c++-test
+
+Depends-on:
+ansi-c++-opt
+
+configure.ac:
+
+Makefile.am:
+if ANSICXX
+TESTS += test-sys_uio-h-c++
+check_PROGRAMS += test-sys_uio-h-c++
+test_sys_uio_h_c___SOURCES = test-sys_uio-h-c++.cc
+endif
diff --git a/modules/sys_uio-h-tests b/modules/sys_uio-h-tests
new file mode 100644
index 0000000000..6720cd8230
--- /dev/null
+++ b/modules/sys_uio-h-tests
@@ -0,0 +1,11 @@
+Files:
+tests/test-sys_uio-h.c
+
+Depends-on:
+sys_uio-h-c++-tests
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-sys_uio-h
+check_PROGRAMS += test-sys_uio-h
diff --git a/modules/sys_uio-tests b/modules/sys_uio-tests
deleted file mode 100644
index 699431cc4e..0000000000
--- a/modules/sys_uio-tests
+++ /dev/null
@@ -1,11 +0,0 @@
-Files:
-tests/test-sys_uio.c
-
-Depends-on:
-sys_uio-c++-tests
-
-configure.ac:
-
-Makefile.am:
-TESTS += test-sys_uio
-check_PROGRAMS += test-sys_uio
diff --git a/tests/test-sys_uio-c++.cc b/tests/test-sys_uio-c++.cc
deleted file mode 100644
index 72b3f42409..0000000000
--- a/tests/test-sys_uio-c++.cc
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Test of <sys/uio.h> substitute in C++ mode.
-   Copyright (C) 2022-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>, 2022.  */
-
-#define GNULIB_NAMESPACE gnulib
-#include <config.h>
-
-#include <sys/uio.h>
-
-
-int
-main ()
-{
-}
diff --git a/tests/test-sys_uio-h-c++.cc b/tests/test-sys_uio-h-c++.cc
new file mode 100644
index 0000000000..72b3f42409
--- /dev/null
+++ b/tests/test-sys_uio-h-c++.cc
@@ -0,0 +1,28 @@
+/* Test of <sys/uio.h> substitute in C++ mode.
+   Copyright (C) 2022-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>, 2022.  */
+
+#define GNULIB_NAMESPACE gnulib
+#include <config.h>
+
+#include <sys/uio.h>
+
+
+int
+main ()
+{
+}
diff --git a/tests/test-sys_uio-h.c b/tests/test-sys_uio-h.c
new file mode 100644
index 0000000000..d371471f87
--- /dev/null
+++ b/tests/test-sys_uio-h.c
@@ -0,0 +1,32 @@
+/* Test of <sys/uio.h> substitute.
+   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 Eric Blake <eblake@redhat.com>, 2011.  */
+
+#include <config.h>
+
+#include <sys/uio.h>
+
+/* Check that necessary types are defined.  */
+size_t a;
+ssize_t b;
+struct iovec c;
+
+int
+main (void)
+{
+  return a + b + !!c.iov_base + c.iov_len;
+}
diff --git a/tests/test-sys_uio.c b/tests/test-sys_uio.c
deleted file mode 100644
index d371471f87..0000000000
--- a/tests/test-sys_uio.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Test of <sys/uio.h> substitute.
-   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 Eric Blake <eblake@redhat.com>, 2011.  */
-
-#include <config.h>
-
-#include <sys/uio.h>
-
-/* Check that necessary types are defined.  */
-size_t a;
-ssize_t b;
-struct iovec c;
-
-int
-main (void)
-{
-  return a + b + !!c.iov_base + c.iov_len;
-}