diff options
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 36aea5f9..d2677081 100644 --- a/common/tables.c +++ b/common/tables.c @@ -34,7 +34,7 @@ #ifndef lint static char copyright[] = -"$Id: tables.c,v 1.58.14.4 2007/02/14 22:41:22 dhankins Exp $ Copyright (c) 2004-2007 Internet Systems Consortium. All rights reserved.\n"; +"$Id: tables.c,v 1.58.14.4.10.1 2007/06/11 22:53:34 each Exp $ Copyright (c) 2004-2007 Internet Systems Consortium. All rights reserved.\n"; #endif /* not lint */ #include "dhcpd.h" @@ -562,7 +562,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 @@ -617,14 +617,14 @@ 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 != default_option_format) - dfree((*dest)->format, file, line); + dfree((char *) (*dest)->format, file, line); dfree(*dest, file, line); } |