Rename module strings to strings-h.

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

diff --git a/ChangeLog b/ChangeLog
index 21666360bae2c82fd4199f11054516bc7482cb08..57d7d1e99f76e19e1a94f7f21201b493999626e2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2024-12-27  Bruno Haible  <bruno@clisp.org>
+
+       Rename module strings to strings-h.
+       * modules/strings-h: Renamed from modules/strings.
+       * modules/strings-h-tests: Renamed from modules/strings-tests.
+       * modules/strings-h-c++-tests: Renamed from modules/strings-c++-tests.
+       * tests/test-strings-h.c: Renamed from tests/test-strings.c.
+       * tests/test-strings-h-c++.cc: Renamed from tests/test-strings-c++.cc.
+       * doc/posix-headers/strings.texi: Update.
+       * modules/* (Depends-on): Update.
+       * modules/strings: New file.
+
 2024-12-27  Bruno Haible  <bruno@clisp.org>
 
        Rename module string to string-h.

diff --git a/doc/posix-headers/strings.texi b/doc/posix-headers/strings.texi
index 279f812a6f5717c892d7c1e5cb2365aeb628073c..b9190b4368780f58f5de045d921410171710bb31 100644 (file)
--- a/doc/posix-headers/strings.texi
+++ b/doc/posix-headers/strings.texi
@@ -3,8 +3,8 @@
 
 POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/strings.h.html}
 
-Gnulib module: strings
-@mindex strings
+Gnulib module: strings-h
+@mindex strings-h
 
 Portability problems fixed by Gnulib:
 @itemize

diff --git a/modules/bcopy b/modules/bcopy
index 146fb90c6a7fd7dfcfa5f3828910a88793df0ca4..124b3be7c30369c7992458419b0ad031c56811ba 100644 (file)
--- a/modules/bcopy
+++ b/modules/bcopy
@@ -11,7 +11,7 @@ Files:
 lib/bcopy.c
 
 Depends-on:
-strings
+strings-h
 
 configure.ac:
 AC_REPLACE_FUNCS(bcopy)

diff --git a/modules/ffs b/modules/ffs
index 90980fd728ad12e48c2a553e886db03802a14395..e8bb9b3e44df18521357a16421b2fbd63db1d272 100644 (file)
--- a/modules/ffs
+++ b/modules/ffs
@@ -6,7 +6,7 @@ lib/ffs.c
 m4/ffs.m4
 
 Depends-on:
-strings
+strings-h
 
 configure.ac:
 gl_FUNC_FFS

diff --git a/modules/posixcheck b/modules/posixcheck
index 8394ede762e29f1eb662a79a2779daea55e9bbb6..2371aaf0e48b30f26e9dded89fdda17a7e7e06ff 100644 (file)
--- a/modules/posixcheck
+++ b/modules/posixcheck
@@ -31,7 +31,7 @@ spawn-h
 stdio-h
 stdlib-h
 string-h
-strings
+strings-h
 sys_file
 sys_ioctl
 sys_random

diff --git a/modules/strcase b/modules/strcase
index faf40578e7a18a03e470190b6244fb7fbf9a3ea5..4d90a042a5b6941217dc95fc215a4a587c265f9d 100644 (file)
--- a/modules/strcase
+++ b/modules/strcase
@@ -7,7 +7,7 @@ lib/strncasecmp.c
 m4/strcase.m4
 
 Depends-on:
-strings
+strings-h
 
 configure.ac:
 gl_STRCASE

diff --git a/modules/strings b/modules/strings
index 6e8ef4868419583938b0241fdd07552a6a3d52e7..689e1dcf18573b6570e902743a93e3284fcf0d56 100644 (file)
--- a/modules/strings
+++ b/modules/strings
@@ -1,47 +1,20 @@
 Description:
 A substitute <strings.h>.
 
+Status:
+deprecated
+
+Notice:
+This module is deprecated. Use the module 'strings-h' instead.
+
 Files:
-lib/strings.in.h
-m4/strings_h.m4
 
 Depends-on:
-gen-header
-include_next
-snippet/arg-nonnull
-snippet/c++defs
-snippet/warn-on-use
-sys_types
+strings-h
 
 configure.ac:
-gl_STRINGS_H
-gl_STRINGS_H_REQUIRE_DEFAULTS
-AC_PROG_MKDIR_P
 
 Makefile.am:
-BUILT_SOURCES += strings.h
-
-# We need the following in order to create <strings.h> when the system
-# doesn't have one that works with the given compiler.
-strings.h: strings.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_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|@''HAVE_STRINGS_H''@|$(HAVE_STRINGS_H)|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_STRINGS_H''@|$(NEXT_STRINGS_H)|g' \
-             -e 's/@''GNULIB_FFS''@/$(GNULIB_FFS)/g' \
-             -e 's|@''HAVE_FFS''@|$(HAVE_FFS)|g' \
-             -e 's|@''HAVE_STRCASECMP''@|$(HAVE_STRCASECMP)|g' \
-             -e 's|@''HAVE_DECL_STRNCASECMP''@|$(HAVE_DECL_STRNCASECMP)|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)/strings.in.h > $@-t
-       $(AM_V_at)mv $@-t $@
-MOSTLYCLEANFILES += strings.h strings.h-t
 
 Include:
 <strings.h>
@@ -50,4 +23,3 @@ License:
 LGPLv2+
 
 Maintainer:
-all

diff --git a/modules/strings-c++-tests b/modules/strings-c++-tests
deleted file mode 100644 (file)
index 485b701..0000000
--- a/modules/strings-c++-tests
+++ /dev/null
@@ -1,18 +0,0 @@
-Files:
-tests/test-strings-c++.cc
-tests/signature.h
-
-Status:
-c++-test
-
-Depends-on:
-ansi-c++-opt
-
-configure.ac:
-
-Makefile.am:
-if ANSICXX
-TESTS += test-strings-c++
-check_PROGRAMS += test-strings-c++
-test_strings_c___SOURCES = test-strings-c++.cc
-endif

diff --git a/modules/strings-h b/modules/strings-h
new file mode 100644 (file)
index 0000000..6e8ef48
--- /dev/null
+++ b/modules/strings-h
@@ -0,0 +1,53 @@
+Description:
+A substitute <strings.h>.
+
+Files:
+lib/strings.in.h
+m4/strings_h.m4
+
+Depends-on:
+gen-header
+include_next
+snippet/arg-nonnull
+snippet/c++defs
+snippet/warn-on-use
+sys_types
+
+configure.ac:
+gl_STRINGS_H
+gl_STRINGS_H_REQUIRE_DEFAULTS
+AC_PROG_MKDIR_P
+
+Makefile.am:
+BUILT_SOURCES += strings.h
+
+# We need the following in order to create <strings.h> when the system
+# doesn't have one that works with the given compiler.
+strings.h: strings.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_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|@''HAVE_STRINGS_H''@|$(HAVE_STRINGS_H)|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_STRINGS_H''@|$(NEXT_STRINGS_H)|g' \
+             -e 's/@''GNULIB_FFS''@/$(GNULIB_FFS)/g' \
+             -e 's|@''HAVE_FFS''@|$(HAVE_FFS)|g' \
+             -e 's|@''HAVE_STRCASECMP''@|$(HAVE_STRCASECMP)|g' \
+             -e 's|@''HAVE_DECL_STRNCASECMP''@|$(HAVE_DECL_STRNCASECMP)|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)/strings.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
+MOSTLYCLEANFILES += strings.h strings.h-t
+
+Include:
+<strings.h>
+
+License:
+LGPLv2+
+
+Maintainer:
+all

diff --git a/modules/strings-h-c++-tests b/modules/strings-h-c++-tests
new file mode 100644 (file)
index 0000000..4e212c0
--- /dev/null
+++ b/modules/strings-h-c++-tests
@@ -0,0 +1,18 @@
+Files:
+tests/test-strings-h-c++.cc
+tests/signature.h
+
+Status:
+c++-test
+
+Depends-on:
+ansi-c++-opt
+
+configure.ac:
+
+Makefile.am:
+if ANSICXX
+TESTS += test-strings-h-c++
+check_PROGRAMS += test-strings-h-c++
+test_strings_h_c___SOURCES = test-strings-h-c++.cc
+endif

diff --git a/modules/strings-h-tests b/modules/strings-h-tests
new file mode 100644 (file)
index 0000000..c4dc605
--- /dev/null
+++ b/modules/strings-h-tests
@@ -0,0 +1,11 @@
+Files:
+tests/test-strings-h.c
+
+Depends-on:
+strings-h-c++-tests
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-strings-h
+check_PROGRAMS += test-strings-h

diff --git a/modules/strings-tests b/modules/strings-tests
deleted file mode 100644 (file)
index ad66af4..0000000
--- a/modules/strings-tests
+++ /dev/null
@@ -1,11 +0,0 @@
-Files:
-tests/test-strings.c
-
-Depends-on:
-strings-c++-tests
-
-configure.ac:
-
-Makefile.am:
-TESTS += test-strings
-check_PROGRAMS += test-strings

diff --git a/tests/test-strings-c++.cc b/tests/test-strings-h-c++.cc
similarity index 100%
rename from tests/test-strings-c++.cc
rename to tests/test-strings-h-c++.cc

diff --git a/tests/test-strings.c b/tests/test-strings-h.c
similarity index 100%
rename from tests/test-strings.c
rename to tests/test-strings-h.c