libfshelp/get-identity.c: Simplify checking weak references

* libfshelp/get-identity.c (id_clean): Test whether i is still in the
hash table instead of counting weak references.

1 files changed, 4 insertions, 5 deletions

diff --git a/libfshelp/get-identity.c b/libfshelp/get-identity.c
index 96de55a8..ac1b4f0b 100644
--- a/libfshelp/get-identity.c
+++ b/libfshelp/get-identity.c
@@ -69,14 +69,13 @@ static void
 id_clean (void *cookie)
 {
   struct idspec *i = cookie;
-  struct references result;
   pthread_mutex_lock (&idlock);
-  refcounts_references (&i->pi.refcounts, &result);
-  if (result.hard == 0 && result.weak == 2)
+  if (refcounts_hard_references(&i->pi.refcounts) == 0
+      && i->id_hashloc != NULL)
     {
-      /* Nobody got a send right in between and we have the last weak reference
-         in addition to our caller's, so we can remove from the hash. */
+      /* Nobody got a send right in between, we can remove i from the hash.  */
       hurd_ihash_locp_remove (&idhash, i->id_hashloc);
+      i->id_hashloc = NULL;
       ports_port_deref_weak (&i->pi);
     }
   pthread_mutex_unlock (&idlock);