i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implemented hash_remove_current() which removes the current iterator position

Browse Source 
from the hash - not yet tested.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20368 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2007-03-11 21:18:49 +00:00
parent 824e907a2c
commit 826e857cf0
2 changed files with 70 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/kernel/util/khash.h
+18 -12
View File
@@ -1,9 +1,16 @@
/*
** Copyright 2001-2002, Travis Geiselbrecht. All rights reserved.
** Distributed under the terms of the NewOS License.
*/
#ifndef _KERNEL_KHASH_H
#define _KERNEL_KHASH_H
/*
* Copyright 2002-2007, Haiku Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*
* Copyright 2001-2002, Travis Geiselbrecht. All rights reserved.
* Distributed under the terms of the NewOS License.
*/
#ifndef _KERNEL_UTIL_KHASH_H
#define _KERNEL_UTIL_KHASH_H
#include <SupportDefs.h>
// can be allocated on the stack
typedef struct hash_iterator {
@@ -23,6 +30,7 @@ struct hash_table *hash_init(uint32 table_size, int next_ptr_offset,
int hash_uninit(struct hash_table *table);
status_t hash_insert(struct hash_table *table, void *_element);
status_t hash_remove(struct hash_table *table, void *_element);
void hash_remove_current(struct hash_table *table, struct hash_iterator *iterator);
void *hash_remove_first(struct hash_table *table, uint32 *_cookie);
void *hash_find(struct hash_table *table, void *e);
void *hash_lookup(struct hash_table *table, const void *key);
@@ -31,17 +39,15 @@ void hash_close(struct hash_table *table, struct hash_iterator *i, bool free_ite
void *hash_next(struct hash_table *table, struct hash_iterator *i);
void hash_rewind(struct hash_table *table, struct hash_iterator *i);
/* function ptrs must look like this:
/* function pointers must look like this:
*
* uint32 hash_func(void *e, const void *key, uint32 range);
* hash function should calculate hash on either e or key,
* depending on which one is not NULL
* depending on which one is not NULL - they also need
* to make sure the returned value is within range.
* int compare_func(void *e, const void *key);
* compare function should compare the element with
* the key, returning 0 if equal, other if not
* NOTE: compare func can be null, in which case the hash
* code will compare the key pointer with the target
* ToDo: check this!
*/
uint32 hash_hash_string(const char *str);
@@ -50,4 +56,4 @@ uint32 hash_hash_string(const char *str);
}
#endif
#endif /* _KERNEL_KHASH_H */
#endif /* _KERNEL_UTIL_KHASH_H */