From 3ae9bebe33dba88aeb6ad7844640498497306f08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Axel=20D=C3=B6rfler?= <axeld@pinc-software.de>
Date: Fri, 29 Nov 2002 08:38:52 +0000
Subject: [PATCH] Fixes for the khash changes.

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2117 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/kernel/core/team.c        | 16 +++++++++-------
 src/kernel/core/vm/vm.c       | 12 +++++++++---
 src/kernel/core/vm/vm_cache.c |  3 ++-
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/kernel/core/team.c b/src/kernel/core/team.c
index 41c968b692..4a1302d0d3 100644
--- a/src/kernel/core/team.c
+++ b/src/kernel/core/team.c
@@ -45,7 +45,7 @@ spinlock team_spinlock = 0;
 static struct team *create_team_struct(const char *name, bool kernel);
 static void delete_team_struct(struct team *p);
 static int team_struct_compare(void *_p, const void *_key);
-static unsigned int team_struct_hash(void *_p, const void *_key, unsigned int range);
+static uint32 team_struct_hash(void *_p, const void *_key, uint32 range);
 static void kfree_strings_array(char **strings, int strc);
 static int user_copy_strings_array(char **strings, int strc, char ***kstrings);
 static void _dump_team_info(struct team *p);
@@ -301,21 +301,23 @@ team_struct_compare(void *_p, const void *_key)
 	struct team *p = _p;
 	const struct team_key *key = _key;
 
-	if(p->id == key->id) return 0;
-	else return 1;
+	if (p->id == key->id)
+		return 0;
+
+	return 1;
 }
 
 
-static unsigned int
-team_struct_hash(void *_p, const void *_key, unsigned int range)
+static uint32
+team_struct_hash(void *_p, const void *_key, uint32 range)
 {
 	struct team *p = _p;
 	const struct team_key *key = _key;
 
 	if (p != NULL)
-		return (p->id % range);
+		return p->id % range;
 
-	return (key->id % range);
+	return key->id % range;
 }
 
 
diff --git a/src/kernel/core/vm/vm.c b/src/kernel/core/vm/vm.c
index 73aa9a933b..b12cb2370f 100755
--- a/src/kernel/core/vm/vm.c
+++ b/src/kernel/core/vm/vm.c
@@ -75,7 +75,9 @@ static int region_compare(void *_r, const void *key)
 		return -1;
 }
 
-static unsigned int region_hash(void *_r, const void *key, unsigned int range)
+
+static uint32
+region_hash(void *_r, const void *key, uint32 range)
 {
 	vm_region *r = _r;
 	const region_id *id = key;
@@ -86,7 +88,9 @@ static unsigned int region_hash(void *_r, const void *key, unsigned int range)
 		return (*id % range);
 }
 
-static int aspace_compare(void *_a, const void *key)
+
+static int
+aspace_compare(void *_a, const void *key)
 {
 	vm_address_space *aspace = _a;
 	const aspace_id *id = key;
@@ -97,7 +101,9 @@ static int aspace_compare(void *_a, const void *key)
 		return -1;
 }
 
-static unsigned int aspace_hash(void *_a, const void *key, unsigned int range)
+
+static uint32
+aspace_hash(void *_a, const void *key, uint32 range)
 {
 	vm_address_space *aspace = _a;
 	const aspace_id *id = key;
diff --git a/src/kernel/core/vm/vm_cache.c b/src/kernel/core/vm/vm_cache.c
index 813a19c0f9..4749462397 100755
--- a/src/kernel/core/vm/vm_cache.c
+++ b/src/kernel/core/vm/vm_cache.c
@@ -44,7 +44,8 @@ static int page_compare_func(void *_p, const void *_key)
 
 #define HASH(offset, ref) ((unsigned int)(offset >> 12) ^ ((unsigned int)(ref)>>4))
 
-static unsigned int page_hash_func(void *_p, const void *_key, unsigned int range)
+static uint32
+page_hash_func(void *_p, const void *_key, uint32 range)
 {
 	vm_page *p = _p;
 	const struct page_lookup_key *key = _key;