]> Savannah Git Hosting - gnulib.git/commitdiff
clean-temp: Fix link error (regression yesterday).
authorBruno Haible <bruno@clisp.org>
Wed, 30 Apr 2025 11:11:01 +0000 (13:11 +0200)
committerBruno Haible <bruno@clisp.org>
Wed, 30 Apr 2025 11:12:23 +0000 (13:12 +0200)
* lib/clean-temp.c: Include hashkey-string.h.
(create_temp_dir): Use hashkey_string_* functions instead of
clean_temp_string_*.
* lib/clean-temp-private.h (clean_temp_string_equals,
clean_temp_string_hash): Remove declarations.
* modules/clean-temp (Depends-on): Add hashkey-string.

ChangeLog
lib/clean-temp-private.h
lib/clean-temp.c
modules/clean-temp

index 810d6af489023756895f275839ba2cf6f3b54a1b..4d3ba4d7b8dcda7b950e251b8ee489566f397ce7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2025-04-30  Bruno Haible  <bruno@clisp.org>
+
+       clean-temp: Fix link error (regression yesterday).
+       * lib/clean-temp.c: Include hashkey-string.h.
+       (create_temp_dir): Use hashkey_string_* functions instead of
+       clean_temp_string_*.
+       * lib/clean-temp-private.h (clean_temp_string_equals,
+       clean_temp_string_hash): Remove declarations.
+       * modules/clean-temp (Depends-on): Add hashkey-string.
+
 2025-04-30  Bruno Haible  <bruno@clisp.org>
 
        hashcode-named-file: Fix mistake (regression yesterday).
index f94c0d919219c2365876ceef06a44625bdd83a01..468771b98e604de2f49abcc0300f3c9364cd2061 100644 (file)
@@ -68,9 +68,6 @@ struct closeable_fd
 #define descriptors clean_temp_descriptors
 extern gl_list_t /* <closeable_fd *> */ volatile descriptors;
 
-extern bool clean_temp_string_equals (const void *x1, const void *x2);
-extern size_t clean_temp_string_hash (const void *x);
-
 extern _GL_ASYNC_SAFE int clean_temp_asyncsafe_close (struct closeable_fd *element);
 extern void clean_temp_init_asyncsafe_close (void);
 
index 5d85e4c84874735187ed8117e8d3bd8122290613..f477e7719ebdd344a77b7c83dc3e8328e2e8617e 100644 (file)
@@ -45,6 +45,7 @@
 #include "xmalloca.h"
 #include "glthread/lock.h"
 #include "thread-optim.h"
+#include "hashkey-string.h"
 #include "gl_xlist.h"
 #include "gl_linkedhash_list.h"
 #include "gl_linked_list.h"
@@ -219,11 +220,11 @@ create_temp_dir (const char *prefix, const char *parentdir,
   tmpdir->cleanup_verbose = cleanup_verbose;
   tmpdir->subdirs =
     gl_list_create_empty (GL_LINKEDHASH_LIST,
-                          clean_temp_string_equals, clean_temp_string_hash,
+                          hashkey_string_equals, hashkey_string_hash,
                           NULL, false);
   tmpdir->files =
     gl_list_create_empty (GL_LINKEDHASH_LIST,
-                          clean_temp_string_equals, clean_temp_string_hash,
+                          hashkey_string_equals, hashkey_string_hash,
                           NULL, false);
 
   /* Create the temporary directory.  */
index 1b0dfd349c40b93fcfbb50188f518d7ff0d575a0..bb36caec99f9029d1ce946b21718ef0935d6a197 100644 (file)
@@ -24,6 +24,7 @@ rmdir
 xalloc
 xalloc-die
 xmalloca
+hashkey-string
 linkedhash-list
 linked-list
 xlist