From a7785e699ab31dc0d2a51b8dbdedde4e82389201 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Wed, 30 Apr 2025 12:28:42 +0200 Subject: [PATCH] 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. --- ChangeLog | 15 +++++++++++++++ MODULES.html.sh | 2 +- lib/hash-pjw.h | 4 ++-- lib/hashcode-named-file.c | 2 +- lib/{hashcode-string.c => hashcode-string2.c} | 4 ++-- lib/{hashcode-string.h => hashcode-string2.h} | 2 +- modules/hash-pjw | 6 +++--- modules/hash-tests | 2 +- modules/hashcode-named-file | 2 +- modules/{hashcode-string => hashcode-string2} | 8 ++++---- tests/test-hash.c | 2 +- top/maint.mk | 4 ++-- 12 files changed, 34 insertions(+), 19 deletions(-) rename lib/{hashcode-string.c => hashcode-string2.c} (91%) rename lib/{hashcode-string.h => hashcode-string2.h} (95%) rename modules/{hashcode-string => hashcode-string2} (60%) diff --git a/ChangeLog b/ChangeLog index 4d3ba4d7b8..8d8567413b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2025-04-30 Bruno Haible + + 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 clean-temp: Fix link error (regression yesterday). diff --git a/MODULES.html.sh b/MODULES.html.sh index baee4f95fd..d57d76531e 100755 --- 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 14af42a891..0b143f2934 100644 --- 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 . */ -#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 a488147edd..1611cb5138 100644 --- a/lib/hashcode-named-file.c +++ b/lib/hashcode-named-file.c @@ -24,7 +24,7 @@ #include #include -#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 6943d7b17b..5a44762723 100644 --- 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 /* Specification. */ -#include "hashcode-string.h" +#include "hashcode-string2.h" #include 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 af99f4e74c..9c10951222 100644 --- 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 56193fa2d1..d1905ed4f2 100644 --- 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 c9593f347d..b9f99d9900 100644 --- 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 bdc68502f8..7e5eebf763 100644 --- 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 a9484514db..7a26702471 100644 --- 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 e7735684be..78a1bff37c 100644 --- a/tests/test-hash.c +++ b/tests/test-hash.c @@ -18,7 +18,7 @@ #include #include "hash.h" -#include "hashcode-string.h" +#include "hashcode-string2.h" #include "inttostr.h" #include diff --git a/top/maint.mk b/top/maint.mk index a5392fc938..e03e887cba 100644 --- 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='\