auth/

2003-08-17  Marcus Brinkmann  <marcus@gnu.org>

	* auth.c: Include <stddef.h>.
	(pending_users, pending_server): Change type to struct hurd_ihash,
	initialize with HURD_IHASH_INITIALIZER.
	(struct pending): Change type of member LOCP to hurd_ihash_locp_t.
	(S_auth_user_authenticate): Use hurd_ihash_* functions instead
	ihash_*.
	(S_auth_server_authenticate): Likewise.
	(main): Do not allocate the hash tables.

console-client/
2003-08-17  Marcus Brinkmann  <marcus@gnu.org>

	* vga-dynafont.c: Include <stddef.h>.
	(struct mapped_character): Change type of LOCP to
	hurd_ihash_locp_t.
	(struct dynafont): Change type of CHARMAP to struct hurd_ihash.
	(dynafont_new): Use hurd_ihash_init instead of ihash_create.
	Remove variable ERR.  Call hurd_ihash_add instead of ihash_add.
	(dynafont_free): Call hurd_ihash_destroy, no ihash_free.
	(dynafont_lookup_internal): Use hurd_ihash_find, not ihash_find.
	(dynafont_lookup_internal): Call hurd_ihash_locp_remove instead
	ihash_locp_remove, and hurd_ihash_add instead ihash_add.
	(dynafont_change_font): Likewise.  Clean out LOCP if character is
	unmapped.

ftpfs/
2003-08-17  Marcus Brinkmann  <marcus@gnu.org>

	* ftpfs.h: Include <hurd/ihash.h>.
	(struct ftpfs): Change type of INODE_MAPPINGS to struct
	hurd_ihash.
	(struct ftpfs_dir_entry): Change type of INODE_LOCP to
	hurd_ihash_locp_t.
	* node.c (ftpfs_create_node): Call hurd_ihash_add, not ihash_add.
	(netfs_node_norefs): Call hurd_ihash_locp_remove, not
	ihash_locp_remove.
	* fs.c: Include <stddef.h>.
	(ftpfs_create): Call hurd_ihash_init, not hurd_ihash_create.
	Call hurd_ihash_destroy on error.

libihash/
2003-08-17  Marcus Brinkmann  <marcus@gnu.org>

	* ihash.c: Rewritten.
	* ihash.h: Rewritten.
	* Makefile (SRCS): Remove sizes.c.
	(LCLHDRS): Remove priv.h.
	* primes.c, sizes.c, priv.h: Files removed.

2003-08-17  Marcus Brinkmann  <marcus@gnu.org>

	* ports.h (struct port_bucket): Change type of HTABLE to struct
	hurd_ihash.
	(struct port_info): Change type of HENTRY to hurd_ihash_locp_t.
	* lookup-port.c (ports_lookup_port): Use hurd_ihash_find instead
	ihash_find.
	* bucket-iterate.c (_ports_bucket_class_iterate): Use
	HURD_IHASH_ITERATE instead ihash_iterate.
	* inhibit-all-rpcs.c (ports_inhibit_all_rpcs): Likewise.
	* inhibit-bucket-rpcs.c (ports_inhibit_bucket_rpcs): Likewise.
	* create-internal.c (_ports_create_port_internal): Use
	hurd_ihash_add instead ihash_add.
	* import-port.c (ports_import_port): Likewise.
	* reallocate-from-external.c (ports_reallocate_from_external):
	Likewise.
	* reallocate-port.c (ports_reallocate_port): Likewise.
	* transfer-right.c (ports_transfer_right): Likewise.
	* create-bucket.c: Include <stddef.h>.
	(ports_create_bucket): Use hurd_ihash_init instead hurd_ihash_create.
	* class-iterate.c: Do not include <hurd/ihash.h>.
	* claim-right.c (ports_claim_right): Call hurd_ihash_locp_remove
	instead ihash_locp_remove.
	* complete-deallocate.c (_ports_complete_deallocate): Likewise.
	* destroy-right.c (ports_destroy_right): Likewise.
	* reallocate-from-external.c (ports_reallocate_from_external):
	Likewise.
	* reallocate-port.c (ports_reallocate_port): Likewise.
	* transfer-right.c (ports_transfer_right): Likewise.

libps/
2003-08-17  Marcus Brinkmann  <marcus@gnu.org>

	* ps.h (struct ps_context): Change type of members procs, ttys,
	ttys_by_cttyid and users to struct hurd_ihash.
	* context.c (ps_context_create): Remove variables err_procs,
	err_ttys, err_ttys_by_cttyid and err_users.  Use hurd_ihash_init
	instead of ihash_create.  Call hurd_ihash_set_cleanup and the
	hurd_ihash_cleanup_t type instead of ihash_set_cleanup.
	(ps_context_free): Call hurd_ihash_destroy instead of ihash_free.
	(lookup): Call hurd_ihash_find instead ihash_find, hurd_ihash_add
	instead ihash_add.
	(ps_context_find_proc_stat): Take pointer of hash object.
	(ps_context_find_tty): Likewise.
	(ps_context_find_tty_by_cttyid): Likewise.
	(ps_context_find_user): Likewise.

libpthread/
2003-08-17  Marcus Brinkmann  <marcus@gnu.org>

	* sysdeps/hurd/pt-key.h (PTHREAD_KEY_MEMBERS): Change type of
	THREAD_SPECIFICS to hurd_ihash_t.
	* sysdeps/hurd/pt-setspecific.c (pthread_setspecific): Call
	hurd_ihash_create instead ihash_create, and hurd_ihash_add instead
	ihash_add.
	* sysdeps/hurd/pt-getspecific.c (pthread_getspecific): Call
	hurd_ihash_find instead of ihash_find.
	* sysdeps/hurd/pt-destroy-specific.c (__pthread_destroy_specific):
	Call hurd_ihash_find instead of ihash_find, hurd_ihash_remove
	instead of ihash_remove, and hurd_ihash_free instead of
	ihash_free.

proc/
2003-08-17  Marcus Brinkmann  <marcus@gnu.org>

	* proc.h: Include <hurd/ihash.h>.
	(struct proc): Change type of members p_pidhashloc and
	p_taskhashloc to hurd_ihash_locp_t.
	(struct pgrp): Likewise for pg_hashloc.
	(struct session): Likewise for s_hashloc.
	* hash.c: Change type of pghash, pidhash, taskhash and sidhash to
	struct hurd_ihash and initialize them with HURD_IHASH_INITIALIZER.
	Include stddef.h.
	(pid_find): Call hurd_ihash_find instead ihash_find.
	(pid_find_allow_zombie): Likewise.
	(task_find): Likewise.
	(task_find_nocreate): Likewise.
	(pgrp_find): Likewise.
	(session_find): Likewise.
	(add_proc_to_hash): Call hurd_ihash_add instead ihash_add.
	(add_pgrp_to_hash): Likewise.
	(add_session_to_hash): Likewise.
	(remove_pgrp_from_hash): Call hurd_ihash_locp_remove instead
	ihash_locp_remove, and provide hash table pointer.
	(remove_proc_from_hash): Likewise.
	(remove_session_from_hash): Likewise.
	(prociterate): Use HURD_IHASH_ITERATE instead ihash_iterate.

trans/
2003-08-17  Marcus Brinkmann  <marcus@gnu.org>

	* fakeroot.c: Include <stddef.h>.
	(struct netnode): Change type of member idport_locp
	to hurd_ihash_locp_t.
	(idport_ihash): Change type to struct hurd_ihash and initialize
	with HURD_IHASH_INITIALIZER.
	(new_node): Call hurd_ihash_add instead of ihash_add.
	(netfs_node_norefs): Call hrd_ihash_locp_remove instead
	ihash_locp_remove.
	(netfs_S_dir_lookup): Call hurd_ihash_find instead ihash_find.

utils/
2003-08-17  Marcus Brinkmann  <marcus@gnu.org>

	* rpctrace.c: Include <stddef.h>.
	(struct traced_info): Change type of LOCP to hurd_ihash_locp_t.
	(msgid_ihash): Change type to struct hurd_ihash, and initialize
	with HURD_IHASH_INITIALIZER, don't set cleanup here.
	(traced_names): Likewise.
	(main): Call hurd_ihash_set_cleanup for msgid_ihash.  Don't create
	traced_names.
	(parse_msgid_list): Call hurd_ihash_add instead ihash_add.
	(new_send_wrapper): Likewise.
	(msgid_info): Likewise.  Call hurd_ihash_find instead ihash_find.
	(rewrite_right): Likewise.
	(traced_dropweak): Call hurd_ihash_locp_remove instead
	ihash_locp_remove.

4 files changed, 34 insertions, 17 deletions

diff --git a/ftpfs/ChangeLog b/ftpfs/ChangeLog
index c58cfb3e..b53da74f 100644
--- a/ftpfs/ChangeLog
+++ b/ftpfs/ChangeLog
@@ -1,3 +1,17 @@
+2003-08-17  Marcus Brinkmann  <marcus@gnu.org>
+
+	* ftpfs.h: Include <hurd/ihash.h>.
+	(struct ftpfs): Change type of INODE_MAPPINGS to struct
+	hurd_ihash.
+	(struct ftpfs_dir_entry): Change type of INODE_LOCP to
+	hurd_ihash_locp_t.
+	* node.c (ftpfs_create_node): Call hurd_ihash_add, not ihash_add.
+	(netfs_node_norefs): Call hurd_ihash_locp_remove, not
+	ihash_locp_remove.
+	* fs.c: Include <stddef.h>.
+	(ftpfs_create): Call hurd_ihash_init, not hurd_ihash_create.
+	Call hurd_ihash_destroy on error.
+
 2002-10-18  Moritz Schulte  <moritz@duesseldorf.ccc.de>
 
         * dir.c (ftpfs_dir_lookup): Initialize NES.entry.
diff --git a/ftpfs/fs.c b/ftpfs/fs.c
index db6205ce..e4db3031 100644
--- a/ftpfs/fs.c
+++ b/ftpfs/fs.c
@@ -1,6 +1,6 @@
 /* Fs operations
 
-   Copyright (C) 1997,2001 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2001, 2003 Free Software Foundation, Inc.
    Written by Miles Bader <miles@gnu.org>
    This file is part of the GNU Hurd.
 
@@ -18,6 +18,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA. */
 
+#include <stddef.h>
 #include <string.h>
 
 #include <hurd/ihash.h>
@@ -59,24 +60,25 @@ ftpfs_create (char *rmt_path, int fsid,
   new->ftp_params = ftp_params;
   new->ftp_hooks = ftp_hooks;
 
-  err = ihash_create (&new->inode_mappings);
+  hurd_ihash_init (&new->inode_mappings,
+		   offsetof (struct ftpfs_dir_entry, inode_locp));
   spin_lock_init (&new->inode_mappings_lock);
 
-  if (! err)
+  super_root = netfs_make_node (0);
+  if (! super_root)
+    err = ENOMEM;
+  else
     {
-      super_root = netfs_make_node (0);
-      if (! super_root)
-	err = ENOMEM;
-      else
-	{
-	  err = ftpfs_dir_create (new, super_root, rmt_path, &super_root_dir);
-	  if (! err)
-	    err = ftpfs_dir_null_lookup (super_root_dir, &new->root);
-	}
+      err = ftpfs_dir_create (new, super_root, rmt_path, &super_root_dir);
+      if (! err)
+	err = ftpfs_dir_null_lookup (super_root_dir, &new->root);
     }
 
   if (err)
-    free (new);
+    {
+      hurd_ihash_destroy (&new->inode_mappings);
+      free (new);
+    }
   else
     *fs = new;
 
diff --git a/ftpfs/ftpfs.h b/ftpfs/ftpfs.h
index 0ca67aa4..d1d816d7 100644
--- a/ftpfs/ftpfs.h
+++ b/ftpfs/ftpfs.h
@@ -25,6 +25,7 @@
 #include <cthreads.h>
 #include <ftpconn.h>
 #include <maptime.h>
+#include <hurd/ihash.h>
 
 /* Anonymous types.  */
 struct ccache;
@@ -58,7 +59,7 @@ struct ftpfs_dir_entry
   /* When the presence/absence of this file was last checked.  */
   time_t name_timestamp;
 
-  void **inode_locp;		/* Used for removing this entry */
+  hurd_ihash_locp_t inode_locp;	/* Used for removing this entry */
 
   int noent : 1;		/* A negative lookup result.  */
   int valid : 1;		/* Marker for GC'ing.  */
@@ -173,7 +174,7 @@ struct ftpfs
   int fsid;
 
   /* A hash table mapping inode numbers to directory entries.  */
-  struct ihash *inode_mappings;
+  struct hurd_ihash inode_mappings;
   spin_lock_t inode_mappings_lock;
 
   struct ftpfs_params params;
diff --git a/ftpfs/node.c b/ftpfs/node.c
index 73af41f2..1d15a686 100644
--- a/ftpfs/node.c
+++ b/ftpfs/node.c
@@ -61,7 +61,7 @@ ftpfs_create_node (struct ftpfs_dir_entry *e, const char *rmt_path,
 		ftpfs_maptime);
 
   spin_lock (&nn->fs->inode_mappings_lock);
-  ihash_add (nn->fs->inode_mappings, e->stat.st_ino, new, &e->inode_locp);
+  hurd_ihash_add (&nn->fs->inode_mappings, e->stat.st_ino, new);
   spin_unlock (&nn->fs->inode_mappings_lock);
 
   e->node = new;
@@ -92,7 +92,7 @@ netfs_node_norefs (struct node *node)
 
   /* Remove this entry from the set of known inodes.  */
   spin_lock (&nn->fs->inode_mappings_lock);
-  ihash_locp_remove (nn->fs->inode_mappings, nn->dir_entry->inode_locp);
+  hurd_ihash_locp_remove (&nn->fs->inode_mappings, nn->dir_entry->inode_locp);
   spin_unlock (&nn->fs->inode_mappings_lock);
 
   if (nn->contents)