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 | |
| 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')
| -rw-r--r-- | includes/dhcpd.h | 11 | ||||
| -rw-r--r-- | includes/omapip/hash.h | 12 |
2 files changed, 14 insertions, 9 deletions
diff --git a/includes/dhcpd.h b/includes/dhcpd.h index 50899d5c..dc3f52e8 100644 --- a/includes/dhcpd.h +++ b/includes/dhcpd.h @@ -600,6 +600,12 @@ struct collection { struct class *classes; }; +/* Used as an argument to parse_clasS_decl() */ +#define CLASS_TYPE_VENDOR 0 +#define CLASS_TYPE_USER 1 +#define CLASS_TYPE_CLASS 2 +#define CLASS_TYPE_SUBCLASS 3 + /* XXX classes must be reference-counted. */ struct class { OMAPI_OBJECT_PREAMBLE; @@ -1917,7 +1923,8 @@ int write_failover_state (dhcp_failover_state_t *); #endif int db_printable PROTO ((const char *)); int db_printable_len PROTO ((const unsigned char *, unsigned)); -void write_named_billing_class (const char *, unsigned, struct class *); +isc_result_t write_named_billing_class(const unsigned char *, unsigned, + void *); void write_billing_classes (void); int write_billing_class PROTO ((struct class *)); void commit_leases_timeout PROTO ((void *)); @@ -2460,7 +2467,7 @@ void hw_hash_add PROTO ((struct lease *)); void hw_hash_delete PROTO ((struct lease *)); int write_leases PROTO ((void)); int lease_enqueue (struct lease *); -void lease_instantiate (const unsigned char *, unsigned, struct lease *); +isc_result_t lease_instantiate(const unsigned char *, unsigned, void *); void expire_all_pools PROTO ((void)); void dump_subnets PROTO ((void)); #if defined (DEBUG_MEMORY_LEAKAGE) || \ 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) \ |