diff options
| author | Evan Hunt <each@isc.org> | 2007-05-29 18:11:56 +0000 |
|---|---|---|
| committer | Evan Hunt <each@isc.org> | 2007-05-29 18:11:56 +0000 |
| commit | 804401cc8e511b17e3cca6bb34df5f26730a4414 (patch) | |
| tree | 22c15ccf34ea40cc863575ae98036491cdd970f3 /common/tables.c | |
| parent | 6ecda39c2666c85f5d0eda875e4af1ce0df0d7d6 (diff) | |
| download | isc-dhcp-804401cc8e511b17e3cca6bb34df5f26730a4414.tar.gz | |
Merge in changes that were needed in 3.1.0 to silence NetBSD compiler
warnings. [rt16907]
Diffstat (limited to 'common/tables.c')
| -rw-r--r-- | common/tables.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/common/tables.c b/common/tables.c index 5a33f162..1228812d 100644 --- a/common/tables.c +++ b/common/tables.c @@ -34,7 +34,7 @@ #ifndef lint static char copyright[] = -"$Id: tables.c,v 1.63 2007/05/19 19:16:24 dhankins Exp $ Copyright (c) 2004-2007 Internet Systems Consortium. All rights reserved.\n"; +"$Id: tables.c,v 1.64 2007/05/29 18:11:55 each Exp $ Copyright (c) 2004-2007 Internet Systems Consortium. All rights reserved.\n"; #endif /* not lint */ #include "dhcpd.h" @@ -789,7 +789,7 @@ struct universe *config_universe; * option structures omapi typed objects, which is a bigger headache. */ -char *default_option_format = "X"; +char *default_option_format = (char *) "X"; /* Must match hash_reference/dereference types in omapip/hash.h. */ int @@ -844,15 +844,15 @@ option_dereference(struct option **dest, const char *file, int line) /* The option name may be packed in the same alloc as the * option structure. */ - if ((*dest)->name != (char *)((*dest) + 1)) - dfree((*dest)->name, file, line); + if ((char *) (*dest)->name != (char *) ((*dest) + 1)) + dfree((char *) (*dest)->name, file, line); /* It's either a user-configured format (allocated), or the * default static format. */ if (((*dest)->format != NULL) && ((*dest)->format != default_option_format)) { - dfree((*dest)->format, file, line); + dfree((char *) (*dest)->format, file, line); } dfree(*dest, file, line); |