1 files changed, 25 insertions, 18 deletions

diff --git a/proc/hash.c b/proc/hash.c
index 76c2369c..ed670a16 100644
--- a/proc/hash.c
+++ b/proc/hash.c
@@ -20,6 +20,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Written by Michael I. Bushnell.  */
 
 #include <mach.h>
+#include <stddef.h>
 #include <sys/types.h>
 #include <hurd/hurd_types.h>
 #include <string.h>
@@ -29,14 +30,22 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "proc.h"
 #include <hurd/ihash.h>
 
-static struct ihash pghash, pidhash, taskhash, sidhash;
+static struct hurd_ihash pghash
+  = HURD_IHASH_INITIALIZER (offsetof (struct pgrp, pg_hashloc));
+static struct hurd_ihash pidhash
+  = HURD_IHASH_INITIALIZER (offsetof (struct proc, p_pidhashloc));
+static struct hurd_ihash taskhash
+  = HURD_IHASH_INITIALIZER (offsetof (struct proc, p_taskhashloc));
+static struct hurd_ihash sidhash
+  = HURD_IHASH_INITIALIZER (offsetof (struct session, s_hashloc));
 
+
 /* Find the process corresponding to a given pid. */
 struct proc *
 pid_find (pid_t pid)
 {
   struct proc *p;
-  p = ihash_find (&pidhash, pid);
+  p = hurd_ihash_find (&pidhash, pid);
   return (!p || p->p_dead) ? 0 : p;
 }
 
@@ -45,7 +54,7 @@ pid_find (pid_t pid)
 struct proc *
 pid_find_allow_zombie (pid_t pid)
 {
-  return ihash_find (&pidhash, pid);
+  return hurd_ihash_find (&pidhash, pid);
 }
 
 /* Find the process corresponding to a given task. */
@@ -53,7 +62,7 @@ struct proc *
 task_find (task_t task)
 {
   struct proc *p;
-  p = ihash_find (&taskhash, task) ? : add_tasks (task);
+  p = hurd_ihash_find (&taskhash, task) ? : add_tasks (task);
   return (!p || p->p_dead) ? 0 : p;
 }
 
@@ -63,7 +72,7 @@ struct proc *
 task_find_nocreate (task_t task)
 {
   struct proc *p;
-  p = ihash_find (&taskhash, task);
+  p = hurd_ihash_find (&taskhash, task);
   return (!p || p->p_dead) ? 0 : p;
 }
 
@@ -82,58 +91,58 @@ reqport_find (mach_port_t reqport)
 struct pgrp *
 pgrp_find (pid_t pgid)
 {
-  return ihash_find (&pghash, pgid);
+  return hurd_ihash_find (&pghash, pgid);
 }
 
 /* Find the session corresponding to a given sid. */
 struct session *
 session_find (pid_t sid)
 {
-  return ihash_find (&sidhash, sid);
+  return hurd_ihash_find (&sidhash, sid);
 }
 
 /* Add a new process to the various hash tables. */
 void
 add_proc_to_hash (struct proc *p)
 {
-  ihash_add (&pidhash, p->p_pid, p, &p->p_pidhashloc);
-  ihash_add (&taskhash, p->p_task, p, &p->p_taskhashloc);
+  hurd_ihash_add (&pidhash, p->p_pid, p);
+  hurd_ihash_add (&taskhash, p->p_task, p);
 }
 
 /* Add a new process group to the various hash tables. */
 void
 add_pgrp_to_hash (struct pgrp *pg)
 {
-  ihash_add (&pghash, pg->pg_pgid, pg, &pg->pg_hashloc);
+  hurd_ihash_add (&pghash, pg->pg_pgid, pg);
 }
 
 /* Add a new session to the various hash tables. */
 void
 add_session_to_hash (struct session *s)
 {
-  ihash_add (&sidhash, s->s_sid, s, &s->s_hashloc);
+  hurd_ihash_add (&sidhash, s->s_sid, s);
 }
 
 /* Remove a process group from the various hash tables. */
 void
 remove_pgrp_from_hash (struct pgrp *pg)
 {
-  ihash_locp_remove(0, pg->pg_hashloc);
+  hurd_ihash_locp_remove (&pghash, pg->pg_hashloc);
 }
 
 /* Remove a process from the various hash tables. */
 void
 remove_proc_from_hash (struct proc *p)
 {
-  ihash_locp_remove(0, p->p_pidhashloc);
-  ihash_locp_remove(0, p->p_taskhashloc);
+  hurd_ihash_locp_remove (&pidhash, p->p_pidhashloc);
+  hurd_ihash_locp_remove (&taskhash, p->p_taskhashloc);
 }
 
 /* Remove a session from the various hash tables. */
 void
 remove_session_from_hash (struct session *s)
 {
-  ihash_locp_remove(0, s->s_hashloc);
+  hurd_ihash_locp_remove (&sidhash, s->s_hashloc);
 }
 
 /* Call function FUN of two args for each process.  FUN's first arg is
@@ -141,14 +150,12 @@ remove_session_from_hash (struct session *s)
 void
 prociterate (void (*fun) (struct proc *, void *), void *arg)
 {
-  error_t thunk(void *value)
+  HURD_IHASH_ITERATE (&pidhash, value)
     {
       struct proc *p = value;
       if (!p->p_dead)
 	(*fun)(p, arg);
-      return 0;
     }
-  ihash_iterate(&pidhash, thunk);
 }
 
 /* Tell if a pid is available for use */