From: Ted Lemon Date: Mon, 16 Mar 1998 06:14:51 +0000 (+0000) Subject: Clean up bogus Sun CC pointer type mismatches. X-Git-Tag: carrel-2~171 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0daf3ee5fcd9eae4c2363b14c7b2db9ef5ffcf64;p=thirdparty%2Fdhcp.git Clean up bogus Sun CC pointer type mismatches. --- diff --git a/common/sysconf.c b/common/sysconf.c index f2a800475..09146cfa0 100644 --- a/common/sysconf.c +++ b/common/sysconf.c @@ -5,7 +5,7 @@ !!!Boy, howdy, is this ever not guaranteed not to change!!! */ /* - * Copyright (c) 1997 The Internet Software Consortium. + * Copyright (c) 1997, 1998 The Internet Software Consortium. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -44,7 +44,7 @@ #ifndef lint static char copyright[] = -"$Id: sysconf.c,v 1.3 1997/11/29 07:52:33 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium. All rights reserved.\n"; +"$Id: sysconf.c,v 1.4 1998/03/16 06:14:51 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ #include "dhcpd.h" @@ -83,15 +83,17 @@ void sysconf_startup (handler) once = 1; close (sysconf_fd); sysconf_initialized = 0; - add_timeout (cur_time + 60, sysconf_restart, handler); + add_timeout (cur_time + 60, sysconf_restart, (void *)handler); } else - add_protocol ("sysconf", sysconf_fd, sysconf_message, handler); + add_protocol ("sysconf", sysconf_fd, sysconf_message, + (void *)handler); } void sysconf_restart (v) void *v; { - void (*handler) PROTO ((struct sysconf_header *, void *)) = v; + void (*handler) PROTO ((struct sysconf_header *, void *)) = + (void (*) PROTO ((struct sysconf_header *, void *)))v; sysconf_startup (handler); } @@ -130,7 +132,8 @@ void sysconf_message (proto) buf = (char *)0; /* Call the handler... */ - if ((handler = proto -> local)) + if ((handler = ((void (*) PROTO ((struct sysconf_header *, void *))) + proto -> local))) (*handler) (&hdr, buf); if (buf)