Minor compilation errors - type mismatches, extra semi-colons after macros

[ISC-Bugs #20884] [ISC-Bugs #20953] [ISC-Bugs #20955]

6 files changed, 25 insertions, 20 deletions

diff --git a/RELNOTES b/RELNOTES
index f3dc23df..ca32bad3 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -96,6 +96,9 @@ suggested fixes to <dhcp-users@isc.org>.
   from David Cantrell at Red Hat.
   [ISC-Bugs #20264] and parts of [ISC-Bugs #17744] dhclient.8 changes
 
+- Minor compilation errors - type mismatches, extra semi-colons after macros
+  [ISC-Bugs #20884] [ISC-Bugs #20953] [ISC-Bugs #20955]
+
 			Changes since 4.0.2rc1
 
 - None
diff --git a/client/dhc6.c b/client/dhc6.c
index dbfab056..f86973ed 100644
--- a/client/dhc6.c
+++ b/client/dhc6.c
@@ -1,7 +1,7 @@
 /* dhc6.c - DHCPv6 client routines. */
 
 /*
- * Copyright (c) 2006-2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2006-2010 by Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -1483,7 +1483,7 @@ dhc6_select_action(struct client_state *client, isc_result_t rval,
 	struct dhc6_lease *lease;
 
 	if (client == NULL)
-		return ISC_R_INVALIDARG;
+		return ISC_FALSE;
 
 	if (rval == ISC_R_SUCCESS)
 		return ISC_FALSE;
@@ -1602,7 +1602,7 @@ dhc6_reply_action(struct client_state *client, isc_result_t rval,
 {
 
 	if (client == NULL)
-		return ISC_R_INVALIDARG;
+		return ISC_FALSE;
 
 	if (rval == ISC_R_SUCCESS)
 		return ISC_FALSE;
diff --git a/includes/dhcpd.h b/includes/dhcpd.h
index 34de1609..5a89c20f 100644
--- a/includes/dhcpd.h
+++ b/includes/dhcpd.h
@@ -3,7 +3,7 @@
    Definitions for dhcpd... */
 
 /*
- * Copyright (c) 2004-2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2010 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1996-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -3168,8 +3168,8 @@ const char *binding_state_print (enum failover_state);
 
 
 /* mdb6.c */
-HASH_FUNCTIONS_DECL(ia_na, unsigned char *, struct ia_na, ia_na_hash_t);
-HASH_FUNCTIONS_DECL(iaaddr, struct in6_addr *, struct iaaddr, iaaddr_hash_t);
+HASH_FUNCTIONS_DECL(ia_na, unsigned char *, struct ia_na, ia_na_hash_t)
+HASH_FUNCTIONS_DECL(iaaddr, struct in6_addr *, struct iaaddr, iaaddr_hash_t)
 
 isc_result_t iaaddr_allocate(struct iaaddr **iaaddr,
 			     const char *file, int line);
diff --git a/includes/minires/minires.h b/includes/minires/minires.h
index 74d66192..9cb648ab 100644
--- a/includes/minires/minires.h
+++ b/includes/minires/minires.h
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2004,2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2009-2010 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004,2007 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 2001-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -208,7 +209,7 @@ isc_result_t ns_verify_tcp (unsigned char *, unsigned *,
 			    ns_tcp_tsig_state *, int);
 int b64_ntop (unsigned char const *, size_t, char *, size_t);
 
-ns_rcode find_cached_zone (const char *, ns_class, char *,
+isc_result_t find_cached_zone (const char *, ns_class, char *,
 			   size_t, struct in_addr *, int, int *, void *);
 int find_tsig_key (ns_tsig_key **, const char *, void *);
 int forget_zone (void *);
diff --git a/minires/ns_parse.c b/minires/ns_parse.c
index 76a5fa9a..660415ce 100644
--- a/minires/ns_parse.c
+++ b/minires/ns_parse.c
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2004,2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2009-2010 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1996-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -22,7 +23,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: ns_parse.c,v 1.3.580.2 2009/08/06 22:05:34 sar Exp $";
+static const char rcsid[] = "$Id: ns_parse.c,v 1.3.580.3 2010/07/27 21:33:14 sar Exp $";
 #endif
 
 /* Import. */
@@ -126,7 +127,7 @@ ns_initparse(const u_char *msg, unsigned msglen, ns_msg *handle) {
 					  handle->_counts[i], &b);
 
 			if (status != ISC_R_SUCCESS)
-				return STATUS;
+				return status;
 			handle->_sections[i] = msg;
 			msg += b;
 		}
diff --git a/minires/res_findzonecut.c b/minires/res_findzonecut.c
index 68c663b0..bd04994d 100644
--- a/minires/res_findzonecut.c
+++ b/minires/res_findzonecut.c
@@ -1,9 +1,10 @@
 #if !defined(lint) && !defined(SABER)
-static const char rcsid[] = "$Id: res_findzonecut.c,v 1.16.580.2 2009/08/06 22:05:34 sar Exp $";
+static const char rcsid[] = "$Id: res_findzonecut.c,v 1.16.580.3 2010/07/27 21:33:14 sar Exp $";
 #endif /* not lint */
 
 /*
- * Copyright (c) 2004,2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2009-2010 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1999-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -67,7 +68,7 @@ typedef ISC_LIST(rr_ns) rrset_ns;
 static int	satisfy(res_state,
 			const char *, rrset_ns *, struct in_addr *, int);
 static int	add_addrs(res_state, rr_ns *, struct in_addr *, int);
-static ns_rcode	get_soa(res_state, const char *, ns_class,
+static isc_result_t get_soa(res_state, const char *, ns_class,
 			char *, size_t, char *, size_t,
 			rrset_ns *);
 static isc_result_t get_ns(res_state, const char *, ns_class, rrset_ns *);
@@ -240,7 +241,7 @@ add_addrs(res_state statp, rr_ns *nsrr, struct in_addr *addrs, int naddrs) {
 	return (n);
 }
 
-static ns_rcode
+static isc_result_t
 get_soa(res_state statp, const char *dname, ns_class class,
 	char *zname, size_t zsize, char *mname, size_t msize,
 	rrset_ns *nsrrsp)
@@ -250,17 +251,16 @@ get_soa(res_state statp, const char *dname, ns_class class,
 	int n, i, ancount, nscount;
 	ns_sect sect;
 	ns_msg msg;
-	u_int rcode;
-	isc_result_t status;
+	isc_result_t rcode;
 
 	/*
 	 * Find closest enclosing SOA, even if it's for the root zone.
 	 */
 
 	/* First canonicalize dname (exactly one unescaped trailing "."). */
-	status = ns_makecanon(dname, tname, sizeof tname);
-	if (status != ISC_R_SUCCESS)
-		return status;
+	rcode = ns_makecanon(dname, tname, sizeof tname);
+	if (rcode != ISC_R_SUCCESS)
+		return rcode;
 	dname = tname;
 
 	/* Now grovel the subdomains, hunting for an SOA answer or auth. */