config.c, lease.h, common.c: removed compilation warnings

4 files changed, 7 insertions, 8 deletions

diff --git a/CHANGES b/CHANGES
index a29ca23..27dba0d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2007-07-25  SUZUKI, Shinsuke <suz@kame.net>
+	* config.c, lease.h, common.c: removed compilation warnings
+
 2007-07-24  SUZUKI, Shinsuke <suz@kame.net>
 	* dhcp6s.c, dhcp6c.c, dhcp6relay.c, configure*: use sig_atomic_t for
 	  a signal-handler variable (Bug-ID 1678874)
diff --git a/common.c b/common.c
index 2f42ed8..8011423 100644
--- a/common.c
+++ b/common.c
@@ -359,7 +359,6 @@ dhcp6_get_addr(optlen, cp, type, list)
 	struct dhcp6_list *list;
 {
 	void *val;
-	int option;
 
 	if (optlen % sizeof(struct in6_addr) || optlen == 0) {
 		dprintf(LOG_INFO, FNAME,
@@ -1493,7 +1492,6 @@ dhcp6_get_options(p, ep, optinfo)
 	char *bp, *cp, *val;
 	u_int16_t val16;
 	u_int32_t val32;
-	struct in6_addr valaddr;
 	struct dhcp6opt_ia optia;
 	struct dhcp6_ia ia;
 	struct dhcp6_list sublist;
@@ -2149,7 +2147,7 @@ sprint_uint64(buf, buflen, i64)
 	u_int64_t i64;
 {
 	u_int16_t rd0, rd1, rd2, rd3;
-	u_int16_t *ptr = (u_int16_t *)&i64;
+	u_int16_t *ptr = (u_int16_t *)(void *)&i64;
 
 	rd0 = ntohs(*ptr++);
 	rd1 = ntohs(*ptr++);
@@ -2247,7 +2245,7 @@ dhcp6_set_options(type, optbp, optep, optinfo)
 	struct dhcp6_optinfo *optinfo;
 {
 	struct dhcp6opt *p = optbp;
-	struct dhcp6_listval *stcode, *op, *d;
+	struct dhcp6_listval *stcode, *op;
 	int len = 0, optlen;
 	char *tmpbuf = NULL;
 
diff --git a/config.c b/config.c
index 4b438d1..2ebc01b 100644
--- a/config.c
+++ b/config.c
@@ -974,8 +974,6 @@ configure_authinfo(authlist)
 int
 configure_global_option()
 {
-	struct cf_list *cl;
-
 	/* SIP Server address */
 	if (configure_addr(cf_sip_list, &siplist0, "SIP") < 0)
 		goto bad;
@@ -1543,7 +1541,6 @@ add_options(opcode, ifc, cfl0)
 	struct dhcp6_ifconf *ifc;
 	struct cf_list *cfl0;
 {
-	struct dhcp6_listval *opt;
 	struct cf_list *cfl;
 	int opttype;
 	struct authinfo *ainfo;
diff --git a/lease.h b/lease.h
index f556eb7..fec7867 100644
--- a/lease.h
+++ b/lease.h
@@ -34,6 +34,7 @@ extern int lease_init __P((void));
 extern void lease_cleanup __P((void));
 extern int lease_address __P((struct in6_addr *));
 extern void release_address __P((struct in6_addr *));
-extern int is_addr_leased __P((struct in6_addr *));
+extern void decline_address __P((struct in6_addr *));
+extern int is_leased __P((struct in6_addr *));
 
 #endif