[master] use ANSI prototypes, clean up some casts

bin/dnssec/dnssec-signzone.c

@@ -2574,7 +2574,7 @@ report(const char *format, ...) {
 }
 
 static void
-build_final_keylist() {
+build_final_keylist(void) {
 	isc_result_t result;
 	dns_dbversion_t *ver = NULL;
 	dns_diff_t diff;

bin/dnssec/dnssec-verify.c

@@ -165,7 +165,8 @@ main(int argc, char *argv[]) {
 #endif
 	char *classname = NULL;
 	dns_rdataclass_t rdclass;
-	char ch, *endp;
+	char *endp;
+	int ch;
 
 #define CMDLINE_FLAGS \
 	"m:o:I:c:E:v:xz"

bin/named/main.c

@@ -735,7 +735,7 @@ destroy_managers(void) {
 }
 
 static void
-dump_symboltable() {
+dump_symboltable(void) {
 	int i;
 	isc_result_t result;
 	const char *fname;

bin/named/unix/os.c

@@ -607,7 +607,7 @@ ns_os_changeuser(void) {
 }
 
 void
-ns_os_adjustnofile() {
+ns_os_adjustnofile(void) {
 #ifdef HAVE_LINUXTHREADS
 	isc_result_t result;
 	isc_resourcevalue_t newvalue;

bin/named/win32/ntservice.c

@@ -44,7 +44,7 @@ int bindmain(int, char *[]); /* From main.c */
  * Initialize the Service by registering it.
  */
 void
-ntservice_init() {
+ntservice_init(void) {
 	if (!foreground) {
 		/* Register handler with the SCM */
 		hServiceStatus = RegisterServiceCtrlHandler(BIND_SERVICE_NAME,
@@ -64,14 +64,14 @@ ntservice_init() {
 }
 
 void
-ntservice_shutdown() {
+ntservice_shutdown(void) {
 	UpdateSCM(SERVICE_STOPPED);
 }
 /*
  * Routine to check if this is a service or a foreground program
  */
 BOOL
-ntservice_isservice() {
+ntservice_isservice(void) {
 	return(!foreground);
 }
 /*

bin/named/win32/os.c

@@ -56,7 +56,7 @@ static char *version_error =
 	"named requires Windows 2000 Service Pack 2 or later to run correctly";
 
 void
-ns_paths_init() {
+ns_paths_init(void) {
 	if (!Initialized)
 		isc_ntpaths_init();
 

bin/pkcs11/pkcs11-keygen.c

@@ -250,7 +250,7 @@ keyclass_fromtext(const char *name) {
 }
 
 static void
-usage() {
+usage(void) {
 	fprintf(stderr,
 		"Usage:\n"
 		"\tpkcs11-keygen -a algorithm -b keysize -l label\n"

bin/tests/resolver/t_resolver.c

@@ -104,7 +104,7 @@ destroy_resolver(dns_resolver_t **resolverp) {
 }
 
 static void
-test_dns_resolver_create() {
+test_dns_resolver_create(void) {
 	dns_resolver_t *resolver = NULL;
 
 	t_assert("test_dns_resolver_create", 1, T_REQUIRED, "%s",

bin/tests/zone_test.c

@@ -76,7 +76,7 @@ isc_sockaddr_t addr;
 			(void)NULL
 
 static void
-usage() {
+usage(void) {
 	fprintf(stderr,
 		"usage: zone_test [-dqsSM] [-c class] [-f file] zone\n");
 	exit(1);

bin/tools/nsec3hash.c

@@ -59,8 +59,9 @@ check_result(isc_result_t result, const char *message) {
 }
 
 static void
-usage() {
-	printf("Usage: %s salt algorithm iterations domain\n", program);
+usage(void) {
+	fprintf(stderr, "Usage: %s salt algorithm iterations domain\n",
+		program);
 	exit(1);
 }
 

lib/dns/ecdb.c

@@ -14,8 +14,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ecdb.c,v 1.10.34.1 2012/02/07 00:44:14 each Exp $ */
-
 #include "config.h"
 
 #include <isc/result.h>
@@ -775,19 +773,24 @@ rdataset_settrust(dns_rdataset_t *rdataset, dns_trust_t trust) {
 
 static void
 rdatasetiter_destroy(dns_rdatasetiter_t **iteratorp) {
-	ecdb_rdatasetiter_t *ecdbiterator;
 	isc_mem_t *mctx;
+	union {
+		dns_rdatasetiter_t *rdatasetiterator;
+		ecdb_rdatasetiter_t *ecdbiterator;
+	} u;
 
 	REQUIRE(iteratorp != NULL);
-	ecdbiterator = (ecdb_rdatasetiter_t *)*iteratorp;
-	REQUIRE(DNS_RDATASETITER_VALID(&ecdbiterator->common));
+	REQUIRE(DNS_RDATASETITER_VALID(*iteratorp));
 
-	mctx = ecdbiterator->common.db->mctx;
+	u.rdatasetiterator = *iteratorp;
 
-	ecdbiterator->common.magic = 0;
+	mctx = u.ecdbiterator->common.db->mctx;
+	u.ecdbiterator->common.magic = 0;
 
-	dns_db_detachnode(ecdbiterator->common.db, &ecdbiterator->common.node);
-	isc_mem_put(mctx, ecdbiterator, sizeof(ecdb_rdatasetiter_t));
+	dns_db_detachnode(u.ecdbiterator->common.db,
+			  &u.ecdbiterator->common.node);
+	isc_mem_put(mctx, u.ecdbiterator,
+		    sizeof(ecdb_rdatasetiter_t));
 
 	*iteratorp = NULL;
 }

lib/dns/geoip.c

@@ -208,7 +208,7 @@ set_state(unsigned int family, isc_uint32_t ipnum, const geoipv6_t *ipnum6,
 }
 
 static geoip_state_t *
-get_state() {
+get_state(void) {
 #ifdef ISC_PLATFORM_USETHREADS
 	isc_result_t result;
 	geoip_state_t *state;

lib/dns/openssl_link.c

@@ -242,8 +242,7 @@ dst__openssl_init(const char *engine) {
 }
 
 void
-dst__openssl_destroy() {
-
+dst__openssl_destroy(void) {
 	/*
 	 * Sequence taken from apps_shutdown() in <apps/apps.h>.
 	 */

lib/dns/rbt.c

@@ -15,8 +15,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id$ */
-
 /*! \file */
 
 /* Principal Authors: DCL */
@@ -646,7 +644,7 @@ dns_rbt_serialize_tree(FILE *file, dns_rbt_t *rbt,
 
 	isc_crc64_final(&crc);
 #ifdef DEBUG
-	hexdump("serializing CRC", crc, sizeof(crc));
+	hexdump("serializing CRC", &crc, sizeof(crc));
 #endif
 
 	/* Serialize header */
@@ -841,7 +839,7 @@ dns_rbt_deserialize_tree(void *base_address, size_t filesize,
 
 	isc_crc64_final(&crc);
 #ifdef DEBUG
-	hexdump("deserializing CRC", crc, sizeof(crc));
+	hexdump("deserializing CRC", &crc, sizeof(crc));
 #endif
 
 	/* Check file hash */

lib/dns/rbtdb.c

@@ -15,8 +15,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id$ */
-
 /*! \file */
 
 /*

lib/dns/tests/dbversion_test.c

@@ -57,7 +57,7 @@ static dns_db_t *db1 = NULL, *db2 = NULL;
 static dns_dbversion_t *v1 = NULL, *v2 = NULL;
 
 static void
-setup_db() {
+setup_db(void) {
 	isc_result_t result;
 	result = dns_db_create(mctx, "rbt", dns_rootname, dns_dbtype_zone,
 			       dns_rdataclass_in, 0, NULL, &db1);
@@ -71,7 +71,7 @@ setup_db() {
 }
 
 static void
-close_db() {
+close_db(void) {
 	if (v1 != NULL) {
 		dns_db_closeversion(db1, &v1, ISC_FALSE);
 		ATF_REQUIRE_EQ(v1, NULL);

lib/dns/tests/dispatch_test.c

@@ -65,7 +65,7 @@ make_dispatchset(unsigned int ndisps) {
 }
 
 static void
-teardown() {
+teardown(void) {
 	if (dset != NULL)
 		dns_dispatchset_destroy(&dset);
 	if (dispatchmgr != NULL)

lib/dns/tests/dnstest.c

@@ -76,7 +76,7 @@ static isc_logcategory_t categories[] = {
 };
 
 static void
-cleanup_managers() {
+cleanup_managers(void) {
 	if (app_running)
 		isc_app_finish();
 	if (socketmgr != NULL)
@@ -90,7 +90,7 @@ cleanup_managers() {
 }
 
 static isc_result_t
-create_managers() {
+create_managers(void) {
 	isc_result_t result;
 #ifdef ISC_PLATFORM_USETHREADS
 	ncpus = isc_os_ncpus();
@@ -167,7 +167,7 @@ dns_test_begin(FILE *logfile, isc_boolean_t start_managers) {
 }
 
 void
-dns_test_end() {
+dns_test_end(void) {
 	if (lctx != NULL)
 		isc_log_destroy(&lctx);
 	if (dst_active) {
@@ -243,7 +243,7 @@ dns_test_makezone(const char *name, dns_zone_t **zonep, dns_view_t *view,
 }
 
 isc_result_t
-dns_test_setupzonemgr() {
+dns_test_setupzonemgr(void) {
 	isc_result_t result;
 	REQUIRE(zonemgr == NULL);
 
@@ -272,7 +272,7 @@ dns_test_releasezone(dns_zone_t *zone) {
 }
 
 void
-dns_test_closezonemgr() {
+dns_test_closezonemgr(void) {
 	REQUIRE(zonemgr != NULL);
 
 	dns_zonemgr_shutdown(zonemgr);

lib/irs/context.c

@@ -148,7 +148,7 @@ thread_key_mutex_init(void) {
 }
 
 static isc_result_t
-thread_key_init() {
+thread_key_init(void) {
 	isc_result_t result;
 
 	result = isc_once_do(&once, thread_key_mutex_init);

lib/isc/app_api.c

@@ -179,7 +179,7 @@ isc_appctx_settimermgr(isc_appctx_t *ctx, isc_timermgr_t *timermgr) {
 }
 
 isc_result_t
-isc_app_start() {
+isc_app_start(void) {
 	if (isc_bind9)
 		return (isc__app_start());
 
@@ -205,7 +205,7 @@ isc_app_run() {
 }
 
 isc_result_t
-isc_app_shutdown() {
+isc_app_shutdown(void) {
 	if (isc_bind9)
 		return (isc__app_shutdown());
 
@@ -213,7 +213,7 @@ isc_app_shutdown() {
 }
 
 isc_result_t
-isc_app_reload() {
+isc_app_reload(void) {
 	if (isc_bind9)
 		return (isc__app_reload());
 
@@ -221,7 +221,7 @@ isc_app_reload() {
 }
 
 void
-isc_app_finish() {
+isc_app_finish(void) {
 	if (!isc_bind9)
 		return;
 
@@ -229,7 +229,7 @@ isc_app_finish() {
 }
 
 void
-isc_app_block() {
+isc_app_block(void) {
 	if (!isc_bind9)
 		return;
 
@@ -237,7 +237,7 @@ isc_app_block() {
 }
 
 void
-isc_app_unblock() {
+isc_app_unblock(void) {
 	if (!isc_bind9)
 		return;