debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OpenIndiana and Solaris port

Browse Source
This commit is contained in:
Ulrich Wilkens
2014-10-28 19:46:43 +01:00
committed by Jon Trulson
parent 42e891d9e7
commit 01d6c363fa
296 changed files with 1049 additions and 1091 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cde/programs/dtinfo/DtMmdb/diskhash/disk_hash.C
View File

@@ -298,8 +298,8 @@ void disk_hash::caching(disk_bucket& b, data_t& w, int slot_num)
//debug(cerr, b.bnum());
//debug(cerr, k_vector -> count());
int k = int((long)(*k_vector)[b.bnum()]);
int r = int((long)(*r_vector)[b.bnum()]);
int kv = int((long)(*k_vector)[b.bnum()]);
int rv = int((long)(*r_vector)[b.bnum()]);
///////////////////////////////////////////
// cache all keys in the bycket except w.
@@ -316,7 +316,7 @@ void disk_hash::caching(disk_bucket& b, data_t& w, int slot_num)
if ( x ) {
hash_vector -> insert(
(voidPtr)(size_t)ind,
x -> slot_num(k, r, p, hash_vector -> count())
x -> slot_num(kv, rv, p, hash_vector -> count())
);
}
@@ -331,7 +331,7 @@ void disk_hash::caching(disk_bucket& b, data_t& w, int slot_num)
////////////////////////////////////////
hash_vector -> insert(
(voidPtr)(size_t)slot_num,
w.slot_num(k, r, p, hash_vector -> count())
w.slot_num(kv, rv, p, hash_vector -> count())
);
}
@@ -373,11 +373,11 @@ Boolean disk_hash::member(data_t& w, disk_bucket*& b, int& slot_num) const
b = &bucket_vector -> get_bucket(hash);
int k = int((long)(*k_vector)[b -> bnum()]);
int r = int((long)(*r_vector)[b -> bnum()]);
int kv = int((long)(*k_vector)[b -> bnum()]);
int rv = int((long)(*r_vector)[b -> bnum()]);
slot_num =
int((long)(*hash_vector)[w.slot_num(k, r, p, hash_vector -> count())]);
int((long)(*hash_vector)[w.slot_num(kv, rv, p, hash_vector -> count())]);
//debug(cerr, slot_num);