From 0896dea3382293cc21b92c9b94d3f6b0083e1aad Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 22 Oct 2020 14:50:58 +0100
Subject: [PATCH] gnulib: Replace hash_delete with hash_remove.

Renamed in gnulib with the old function deprecated.
---
 fish/events.c      | 2 +-
 lib/fuse.c         | 6 +++---
 lib/private-data.c | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/fish/events.c b/fish/events.c
index 6b2a73d10..975c82d64 100644
--- a/fish/events.c
+++ b/fish/events.c
@@ -242,7 +242,7 @@ run_delete_event (const char *cmd, size_t argc, char *argv[])
   const struct entry key = { .name = argv[0] };
   struct entry *entry, *p;
 
-  entry = hash_delete (event_handlers, &key);
+  entry = hash_remove (event_handlers, &key);
   if (!entry) {
     fprintf (stderr, _("delete-event: %s: no such event handler\n"), argv[0]);
     return -1;
diff --git a/lib/fuse.c b/lib/fuse.c
index 4cd60485f..5fc8978dc 100644
--- a/lib/fuse.c
+++ b/lib/fuse.c
@@ -1296,7 +1296,7 @@ gen_remove_if_expired (void *x, void *data)
     struct gen_remove_data *d = data;
 
     if (p->timeout < d->now)
-      d->freer (hash_delete (d->ht, x));
+      d->freer (hash_remove (d->ht, x));
   }
 
   return 1;
@@ -1331,7 +1331,7 @@ gen_replace (guestfs_h *g, Hash_table *ht,
 {
   struct entry_common *old_entry;
 
-  old_entry = hash_delete (ht, new_entry);
+  old_entry = hash_remove (ht, new_entry);
   freer (old_entry);
 
   old_entry = hash_insert (ht, new_entry);
@@ -1498,7 +1498,7 @@ gen_remove (Hash_table *ht, const char *pathname, Hash_data_freer freer)
   const struct entry_common key = { .pathname = (char *) pathname };
   struct entry_common *entry;
 
-  entry = hash_delete (ht, &key);
+  entry = hash_remove (ht, &key);
 
   freer (entry);
 }
diff --git a/lib/private-data.c b/lib/private-data.c
index f5ac6391f..11acc7f97 100644
--- a/lib/private-data.c
+++ b/lib/private-data.c
@@ -94,7 +94,7 @@ guestfs_set_private (guestfs_h *g, const char *key, void *data)
   new_entry->key = safe_strdup (g, key);
   new_entry->data = data;
 
-  old_entry = hash_delete (g->pda, new_entry);
+  old_entry = hash_remove (g->pda, new_entry);
   freer (old_entry);
 
   entry = hash_insert (g->pda, new_entry);