diff options
| author | David Hankins <dhankins@isc.org> | 2005-09-30 17:57:32 +0000 |
|---|---|---|
| committer | David Hankins <dhankins@isc.org> | 2005-09-30 17:57:32 +0000 |
| commit | 06e77c34fb9817079c106c94e8f15b2a78c99281 (patch) | |
| tree | 4effcf2103092b19a436fd4a3228ea134c1a067c /includes/omapip/hash.h | |
| parent | c75473d8001ba93461a611ba2d797cf144ab1a54 (diff) | |
| download | isc-dhcp-06e77c34fb9817079c106c94e8f15b2a78c99281.tar.gz | |
Corrections to changes made on HEAD pursuant to review of changes between
V3.0.3 and HEAD. [ISC-Bugs #15348]
Diffstat (limited to 'includes/omapip/hash.h')
| -rw-r--r-- | includes/omapip/hash.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/includes/omapip/hash.h b/includes/omapip/hash.h index b8ecbe6c..a194accc 100644 --- a/includes/omapip/hash.h +++ b/includes/omapip/hash.h @@ -42,8 +42,8 @@ typedef struct { int foo; } hashed_object_t; -typedef void (*hash_foreach_func) (const unsigned char *, - unsigned, hashed_object_t *); +typedef isc_result_t (*hash_foreach_func)(const unsigned char *, unsigned, + void *); typedef int (*hash_reference) (hashed_object_t **, hashed_object_t *, const char *, int); typedef int (*hash_dereference) (hashed_object_t **, const char *, int); @@ -79,8 +79,7 @@ void name##_hash_delete (hashtype *, bufarg, unsigned, \ const char *, int); \ int name##_hash_lookup (type **, hashtype *, bufarg, unsigned, \ const char *, int); \ -int name##_hash_foreach (hashtype *, \ - void (*) (bufarg, unsigned, type *)); \ +int name##_hash_foreach (hashtype *, hash_foreach_func); \ int name##_new_hash (hashtype **, int, const char *, int); \ void name##_free_hash_table (hashtype **, const char *, int); @@ -111,11 +110,10 @@ int name##_hash_lookup (type **ptr, hashtype *table, \ (const unsigned char *)buf, len, file, line); \ } \ \ -int name##_hash_foreach (hashtype *table, \ - void (*func) (bufarg, unsigned, type *)) \ +int name##_hash_foreach (hashtype *table, hash_foreach_func func) \ { \ return hash_foreach ((struct hash_table *)table, \ - (hash_foreach_func)func); \ + func); \ } \ \ int name##_new_hash (hashtype **tp, int c, const char *file, int line) \ |