Rename module hashcode-string to hashcode-string2.

* lib/hashcode-string2.h: Renamed from lib/hashcode-string.h.
* lib/hashcode-string2.c: Renamed from lib/hashcode-string.c.
* modules/hashcode-string2: Renamed from modules/hashcode-string.
* MODULES.html.sh: Update.
* top/maint.mk: Update.
* lib/hash-pjw.h: Update.
* modules/hash-pjw: Update.
* lib/hashcode-named-file.c: Update.
* modules/hashcode-named-file (Depends-on): Update.
* tests/test-hash.c: Update.
* modules/hash-tests (Depends-on): Update.

diff --git a/ChangeLog b/ChangeLog
index 4d3ba4d7b8dcda7b950e251b8ee489566f397ce7..8d8567413bae1e2d84f16f896d972037fa0c0b6b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2025-04-30  Bruno Haible  <bruno@clisp.org>
+
+       Rename module hashcode-string to hashcode-string2.
+       * lib/hashcode-string2.h: Renamed from lib/hashcode-string.h.
+       * lib/hashcode-string2.c: Renamed from lib/hashcode-string.c.
+       * modules/hashcode-string2: Renamed from modules/hashcode-string.
+       * MODULES.html.sh: Update.
+       * top/maint.mk: Update.
+       * lib/hash-pjw.h: Update.
+       * modules/hash-pjw: Update.
+       * lib/hashcode-named-file.c: Update.
+       * modules/hashcode-named-file (Depends-on): Update.
+       * tests/test-hash.c: Update.
+       * modules/hash-tests (Depends-on): Update.
+
 2025-04-30  Bruno Haible  <bruno@clisp.org>
 
        clean-temp: Fix link error (regression yesterday).

diff --git a/MODULES.html.sh b/MODULES.html.sh
index baee4f95fd7eb938d3013ddad73d6352cb443f47..d57d76531e8cb16a026b867014a8f4254dfc4b7a 100755 (executable)
--- a/MODULES.html.sh
+++ b/MODULES.html.sh
@@ -2095,7 +2095,7 @@ func_all_modules ()
   func_module obstack
   func_module obstack-printf
   func_module obstack-printf-posix
-  func_module hashcode-string
+  func_module hashcode-string2
   func_module hashcode-mem
   func_module hash
   func_module hamt

diff --git a/lib/hash-pjw.h b/lib/hash-pjw.h
index 14af42a8919d95c1096c8aa637c86bf7492a93a0..0b143f2934989c54d321a9bf36516b079448ef25 100644 (file)
--- a/lib/hash-pjw.h
+++ b/lib/hash-pjw.h
@@ -14,8 +14,8 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
-#include "hashcode-string.h"
+#include "hashcode-string2.h"
 
 #if __GNUC__ || (__clang_major__ >= 4)
-# warning "The include file hash-pjw.h is deprecated. Use hashcode-string.h instead."
+# warning "The include file hash-pjw.h is deprecated. Use hashcode-string2.h instead."
 #endif

diff --git a/lib/hashcode-named-file.c b/lib/hashcode-named-file.c
index a488147eddb85673b010171835a8f84d00d362b0..1611cb513859fb46a0e80478e0dd893bf8c6c07a 100644 (file)
--- a/lib/hashcode-named-file.c
+++ b/lib/hashcode-named-file.c
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "hashcode-string.h"
+#include "hashcode-string2.h"
 #include "same-inode.h"
 
 #define STREQ(a, b) (strcmp (a, b) == 0)

diff --git a/lib/hashcode-string.c b/lib/hashcode-string2.c
similarity index 91%
rename from lib/hashcode-string.c
rename to lib/hashcode-string2.c
index 6943d7b17b1ae295d418c71e5f44db34bafc5a08..5a447627238fc439b276b359673a7f7f21f3e516 100644 (file)
--- a/lib/hashcode-string.c
+++ b/lib/hashcode-string2.c
@@ -1,4 +1,4 @@
-/* hashcode-string.c -- compute a hash value from a NUL-terminated string.
+/* hashcode-string2.c -- compute a hash value from a NUL-terminated string.
 
    Copyright (C) 2001, 2003, 2006, 2009-2025 Free Software Foundation, Inc.
 
@@ -18,7 +18,7 @@
 #include <config.h>
 
 /* Specification.  */
-#include "hashcode-string.h"
+#include "hashcode-string2.h"
 
 #include <limits.h>
 

diff --git a/lib/hashcode-string.h b/lib/hashcode-string2.h
similarity index 95%
rename from lib/hashcode-string.h
rename to lib/hashcode-string2.h
index af99f4e74c90d92b00a7fd457b8ea9c7d734ba92..9c10951222070a53d4bcb5afe65e6c98741ad284 100644 (file)
--- a/lib/hashcode-string.h
+++ b/lib/hashcode-string2.h
@@ -1,4 +1,4 @@
-/* hashcode-string.h -- declaration for a simple hash function
+/* hashcode-string2.h -- declaration for a simple hash function
    Copyright (C) 2001, 2003, 2009-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify

diff --git a/modules/hash-pjw b/modules/hash-pjw
index 56193fa2d19294f6f0c13fa31a49cca3d15ba285..d1905ed4f29dab63c7cc05395fac095848170e6f 100644 (file)
--- a/modules/hash-pjw
+++ b/modules/hash-pjw
@@ -5,19 +5,19 @@ Status:
 deprecated
 
 Notice:
-This module is deprecated. Use the module 'hashcode-string' instead.
+This module is deprecated. Use the module 'hashcode-string2' instead.
 
 Files:
 
 Depends-on:
-hashcode-string
+hashcode-string2
 
 configure.ac:
 
 Makefile.am:
 
 Include:
-"hashcode-string.h"
+"hashcode-string2.h"
 
 License:
 LGPLv2+

diff --git a/modules/hash-tests b/modules/hash-tests
index c9593f347dc13d7c5f5f0eca7c7d4bed4f7c8cce..b9f99d99001217c16a1bfb861024f0e3e8e93b49 100644 (file)
--- a/modules/hash-tests
+++ b/modules/hash-tests
@@ -3,7 +3,7 @@ tests/test-hash.c
 tests/macros.h
 
 Depends-on:
-hashcode-string
+hashcode-string2
 inttostr
 bool
 

diff --git a/modules/hashcode-named-file b/modules/hashcode-named-file
index bdc68502f82fede3c4653ecb2c7cb0574c342553..7e5eebf76314a16cff1440edb9bcfcb36f976c7e 100644 (file)
--- a/modules/hashcode-named-file
+++ b/modules/hashcode-named-file
@@ -7,7 +7,7 @@ lib/hashcode-file.h
 lib/hash-triple.h
 
 Depends-on:
-hashcode-string
+hashcode-string2
 same-inode
 bool
 

diff --git a/modules/hashcode-string b/modules/hashcode-string2
similarity index 60%
rename from modules/hashcode-string
rename to modules/hashcode-string2
index a9484514db10a27d78ae76512cfafe96c17994d9..7a2670247172f4eaa878e32a0d12ee02ff0665ac 100644 (file)
--- a/modules/hashcode-string
+++ b/modules/hashcode-string2
@@ -2,8 +2,8 @@ Description:
 Compute a hash value for a NUL-terminated string.
 
 Files:
-lib/hashcode-string.h
-lib/hashcode-string.c
+lib/hashcode-string2.h
+lib/hashcode-string2.c
 lib/hash-pjw.h
 
 Depends-on:
@@ -11,10 +11,10 @@ Depends-on:
 configure.ac:
 
 Makefile.am:
-lib_SOURCES += hashcode-string.h hashcode-string.c
+lib_SOURCES += hashcode-string2.h hashcode-string2.c
 
 Include:
-"hashcode-string.h"
+"hashcode-string2.h"
 
 License:
 LGPLv2+

diff --git a/tests/test-hash.c b/tests/test-hash.c
index e7735684be3e85ca861286a9d14b99b988e0dde9..78a1bff37c6b00ea716d206f89fa3bd32fb816f0 100644 (file)
--- a/tests/test-hash.c
+++ b/tests/test-hash.c
@@ -18,7 +18,7 @@
 #include <config.h>
 
 #include "hash.h"
-#include "hashcode-string.h"
+#include "hashcode-string2.h"
 #include "inttostr.h"
 
 #include <stdio.h>

diff --git a/top/maint.mk b/top/maint.mk
index a5392fc9388d825afe044f57568856fbab4a92e5..e03e887cbafcbba1c9c00baaa8ed69863b49f775 100644 (file)
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -728,8 +728,8 @@ sc_prohibit_posixver_without_use:
 sc_prohibit_same_without_use:
        @h='same.h' re='\<same_name(at)? *\(' $(_sc_header_without_use)
 
-sc_prohibit_hashcode_string_without_use:
-       @h='hashcode-string.h' \
+sc_prohibit_hashcode_string2_without_use:
+       @h='hashcode-string2.h' \
        re='\<hash_pjw\>' \
          $(_sc_header_without_use)