From b454c0319685041db3f3e8fd7671e1b364fd20c5 Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Tue, 4 Mar 2014 10:42:25 -0800 Subject: [PATCH] [master] use ANSI prototypes, clean up some casts --- bin/dnssec/dnssec-signzone.c | 2 +- bin/dnssec/dnssec-verify.c | 3 ++- bin/named/main.c | 2 +- bin/named/unix/os.c | 2 +- bin/named/win32/ntservice.c | 6 +++--- bin/named/win32/os.c | 2 +- bin/pkcs11/pkcs11-keygen.c | 2 +- bin/tests/resolver/t_resolver.c | 2 +- bin/tests/zone_test.c | 2 +- bin/tools/nsec3hash.c | 5 +++-- lib/dns/ecdb.c | 21 ++++++++++++--------- lib/dns/geoip.c | 2 +- lib/dns/openssl_link.c | 3 +-- lib/dns/rbt.c | 6 ++---- lib/dns/rbtdb.c | 2 -- lib/dns/tests/dbversion_test.c | 4 ++-- lib/dns/tests/dispatch_test.c | 2 +- lib/dns/tests/dnstest.c | 10 +++++----- lib/irs/context.c | 2 +- lib/isc/app_api.c | 12 ++++++------ lib/isc/backtrace.c | 2 +- lib/isc/hash.c | 4 ++-- lib/isc/lib.c | 2 +- lib/isc/mem.c | 2 +- lib/isc/task.c | 2 +- lib/isc/tests/isctest.c | 6 +++--- lib/isc/tests/socket_test.c | 2 +- lib/isc/timer.c | 2 +- lib/isc/unix/app.c | 6 +++--- lib/isc/unix/net.c | 4 ++-- lib/isc/unix/socket.c | 2 +- lib/isc/win32/app.c | 6 +++--- lib/isc/win32/net.c | 2 +- lib/isc/win32/ntpaths.c | 2 +- lib/isc/win32/socket.c | 2 +- lib/isc/win32/syslog.c | 2 +- 36 files changed, 70 insertions(+), 70 deletions(-) diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c index e7609b177c..7091458b47 100644 --- a/bin/dnssec/dnssec-signzone.c +++ b/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; diff --git a/bin/dnssec/dnssec-verify.c b/bin/dnssec/dnssec-verify.c index fb06ed402f..8d8d22f8f9 100644 --- a/bin/dnssec/dnssec-verify.c +++ b/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" diff --git a/bin/named/main.c b/bin/named/main.c index db67059617..075597d072 100644 --- a/bin/named/main.c +++ b/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; diff --git a/bin/named/unix/os.c b/bin/named/unix/os.c index 3db49e8274..18e8c39103 100644 --- a/bin/named/unix/os.c +++ b/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; diff --git a/bin/named/win32/ntservice.c b/bin/named/win32/ntservice.c index 5fb533da41..fd50a080d2 100644 --- a/bin/named/win32/ntservice.c +++ b/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); } /* diff --git a/bin/named/win32/os.c b/bin/named/win32/os.c index 99f2594ac1..b4369cb557 100644 --- a/bin/named/win32/os.c +++ b/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(); diff --git a/bin/pkcs11/pkcs11-keygen.c b/bin/pkcs11/pkcs11-keygen.c index 6f39c44d7f..ad6ced1fa6 100644 --- a/bin/pkcs11/pkcs11-keygen.c +++ b/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" diff --git a/bin/tests/resolver/t_resolver.c b/bin/tests/resolver/t_resolver.c index 824ca95b6c..6f83814cc7 100644 --- a/bin/tests/resolver/t_resolver.c +++ b/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", diff --git a/bin/tests/zone_test.c b/bin/tests/zone_test.c index 714a699680..7ae3443e32 100644 --- a/bin/tests/zone_test.c +++ b/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); diff --git a/bin/tools/nsec3hash.c b/bin/tools/nsec3hash.c index 57f24c251e..d61efb99cd 100644 --- a/bin/tools/nsec3hash.c +++ b/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); } diff --git a/lib/dns/ecdb.c b/lib/dns/ecdb.c index 91c9426565..f3554d1a82 100644 --- a/lib/dns/ecdb.c +++ b/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 @@ -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; } diff --git a/lib/dns/geoip.c b/lib/dns/geoip.c index 5de5fa160e..23ee524e0d 100644 --- a/lib/dns/geoip.c +++ b/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; diff --git a/lib/dns/openssl_link.c b/lib/dns/openssl_link.c index 56465aa006..21aba8ab66 100644 --- a/lib/dns/openssl_link.c +++ b/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 . */ diff --git a/lib/dns/rbt.c b/lib/dns/rbt.c index caa38d8d12..e2f82d83ef 100644 --- a/lib/dns/rbt.c +++ b/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 */ diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c index bdf5303e58..0e705fad14 100644 --- a/lib/dns/rbtdb.c +++ b/lib/dns/rbtdb.c @@ -15,8 +15,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id$ */ - /*! \file */ /* diff --git a/lib/dns/tests/dbversion_test.c b/lib/dns/tests/dbversion_test.c index 7f54c313dc..3f97ffe9d8 100644 --- a/lib/dns/tests/dbversion_test.c +++ b/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); diff --git a/lib/dns/tests/dispatch_test.c b/lib/dns/tests/dispatch_test.c index bac061ad54..c655311f69 100644 --- a/lib/dns/tests/dispatch_test.c +++ b/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) diff --git a/lib/dns/tests/dnstest.c b/lib/dns/tests/dnstest.c index f06f526eb3..a0eb374ca4 100644 --- a/lib/dns/tests/dnstest.c +++ b/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); diff --git a/lib/irs/context.c b/lib/irs/context.c index be69622b5b..e5f6fb8cd9 100644 --- a/lib/irs/context.c +++ b/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); diff --git a/lib/isc/app_api.c b/lib/isc/app_api.c index 6529b1d249..46b9128f5d 100644 --- a/lib/isc/app_api.c +++ b/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; diff --git a/lib/isc/backtrace.c b/lib/isc/backtrace.c index a5b1a0fdba..584c7561e6 100644 --- a/lib/isc/backtrace.c +++ b/lib/isc/backtrace.c @@ -140,7 +140,7 @@ isc_backtrace_gettrace(void **addrs, int maxaddrs, int *nframes) { #elif defined(BACKTRACE_X86STACK) #ifdef __x86_64__ static unsigned long -getrbp() { +getrbp(void) { __asm("movq %rbp, %rax\n"); } #endif diff --git a/lib/isc/hash.c b/lib/isc/hash.c index 44a5be2d2f..a6edc1f225 100644 --- a/lib/isc/hash.c +++ b/lib/isc/hash.c @@ -275,7 +275,7 @@ isc_hash_ctxinit(isc_hash_t *hctx) { } void -isc_hash_init() { +isc_hash_init(void) { INSIST(hash != NULL && VALID_HASH(hash)); isc_hash_ctxinit(hash); @@ -338,7 +338,7 @@ isc_hash_ctxdetach(isc_hash_t **hctxp) { } void -isc_hash_destroy() { +isc_hash_destroy(void) { unsigned int refs; INSIST(hash != NULL && VALID_HASH(hash)); diff --git a/lib/isc/lib.c b/lib/isc/lib.c index e9f045c672..7a18f8a20c 100644 --- a/lib/isc/lib.c +++ b/lib/isc/lib.c @@ -97,7 +97,7 @@ do_register(void) { } void -isc_lib_register() { +isc_lib_register(void) { RUNTIME_CHECK(isc_once_do(®ister_once, do_register) == ISC_R_SUCCESS); } diff --git a/lib/isc/mem.c b/lib/isc/mem.c index 3c47b3741e..93e2c2c9b9 100644 --- a/lib/isc/mem.c +++ b/lib/isc/mem.c @@ -2266,7 +2266,7 @@ isc_mempool_getfillcount(isc_mempool_t *mpctx0) { } isc_result_t -isc__mem_register() { +isc__mem_register(void) { return (isc_mem_register(isc_mem_create2)); } diff --git a/lib/isc/task.c b/lib/isc/task.c index dbd88a141a..c84feaaac7 100644 --- a/lib/isc/task.c +++ b/lib/isc/task.c @@ -1757,7 +1757,7 @@ isc__task_privilege(isc_task_t *task0) { } isc_result_t -isc__task_register() { +isc__task_register(void) { return (isc_task_register(isc__taskmgr_create)); } diff --git a/lib/isc/tests/isctest.c b/lib/isc/tests/isctest.c index 1ccda3c513..ad66090701 100644 --- a/lib/isc/tests/isctest.c +++ b/lib/isc/tests/isctest.c @@ -63,7 +63,7 @@ static isc_logcategory_t categories[] = { }; static void -cleanup_managers() { +cleanup_managers(void) { if (maintask != NULL) isc_task_destroy(&maintask); if (socketmgr != NULL) @@ -75,7 +75,7 @@ cleanup_managers() { } static isc_result_t -create_managers() { +create_managers(void) { isc_result_t result; #ifdef ISC_PLATFORM_USETHREADS ncpus = isc_os_ncpus(); @@ -143,7 +143,7 @@ isc_test_begin(FILE *logfile, isc_boolean_t start_managers) { } void -isc_test_end() { +isc_test_end(void) { if (maintask != NULL) isc_task_detach(&maintask); if (taskmgr != NULL) diff --git a/lib/isc/tests/socket_test.c b/lib/isc/tests/socket_test.c index 615e1c8aa7..dfd11aaf90 100644 --- a/lib/isc/tests/socket_test.c +++ b/lib/isc/tests/socket_test.c @@ -112,7 +112,7 @@ waitfor(completion_t *completion) { #endif static void -waitbody() { +waitbody(void) { #ifndef ISC_PLATFORM_USETHREADS struct timeval tv; isc_socketwait_t *swait = NULL; diff --git a/lib/isc/timer.c b/lib/isc/timer.c index c617c6e54e..2df7504300 100644 --- a/lib/isc/timer.c +++ b/lib/isc/timer.c @@ -1050,7 +1050,7 @@ isc__timermgr_dispatch(isc_timermgr_t *manager0) { #endif /* USE_TIMER_THREAD */ isc_result_t -isc__timer_register() { +isc__timer_register(void) { return (isc_timer_register(isc__timermgr_create)); } diff --git a/lib/isc/unix/app.c b/lib/isc/unix/app.c index 3adeb3f27e..df903f1ba5 100644 --- a/lib/isc/unix/app.c +++ b/lib/isc/unix/app.c @@ -748,7 +748,7 @@ isc__app_ctxrun(isc_appctx_t *ctx0) { } isc_result_t -isc__app_run() { +isc__app_run(void) { return (isc__app_ctxrun((isc_appctx_t *)&isc_g_appctx)); } @@ -825,7 +825,7 @@ isc__app_ctxshutdown(isc_appctx_t *ctx0) { } isc_result_t -isc__app_shutdown() { +isc__app_shutdown(void) { return (isc__app_ctxshutdown((isc_appctx_t *)&isc_g_appctx)); } @@ -1028,7 +1028,7 @@ isc__appctx_settimermgr(isc_appctx_t *ctx0, isc_timermgr_t *timermgr) { } isc_result_t -isc__app_register() { +isc__app_register(void) { return (isc_app_register(isc__appctx_create)); } diff --git a/lib/isc/unix/net.c b/lib/isc/unix/net.c index 0f440981e5..ad1a3413ad 100644 --- a/lib/isc/unix/net.c +++ b/lib/isc/unix/net.c @@ -722,13 +722,13 @@ try_dscp_v6(void) { } static void -try_dscp() { +try_dscp(void) { try_dscp_v4(); try_dscp_v6(); } static void -initialize_dscp() { +initialize_dscp(void) { RUNTIME_CHECK(isc_once_do(&once_dscp, try_dscp) == ISC_R_SUCCESS); } diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c index ac19d217ce..e111c74a05 100644 --- a/lib/isc/unix/socket.c +++ b/lib/isc/unix/socket.c @@ -6273,7 +6273,7 @@ isc__socket_gettag(isc_socket_t *socket0) { } isc_result_t -isc__socket_register() { +isc__socket_register(void) { return (isc_socket_register(isc__socketmgr_create)); } diff --git a/lib/isc/win32/app.c b/lib/isc/win32/app.c index ccccb1d812..66157b0045 100644 --- a/lib/isc/win32/app.c +++ b/lib/isc/win32/app.c @@ -317,7 +317,7 @@ isc__app_ctxrun(isc_appctx_t *ctx0) { } isc_result_t -isc__app_run() { +isc__app_run(void) { return (isc__app_ctxrun((isc_appctx_t *)&isc_g_appctx)); } @@ -346,7 +346,7 @@ isc__app_ctxshutdown(isc_appctx_t *ctx0) { } isc_result_t -isc__app_shutdown() { +isc__app_shutdown(void) { return (isc__app_ctxshutdown((isc_appctx_t *)&isc_g_appctx)); } @@ -480,7 +480,7 @@ isc__appctx_settimermgr(isc_appctx_t *ctx0, isc_timermgr_t *timermgr) { } isc_result_t -isc__app_register() { +isc__app_register(void) { return (isc_app_register(isc__appctx_create)); } diff --git a/lib/isc/win32/net.c b/lib/isc/win32/net.c index 482277844c..0afc413ef3 100644 --- a/lib/isc/win32/net.c +++ b/lib/isc/win32/net.c @@ -334,6 +334,6 @@ isc_net_enableipv6(void) { } unsigned int -isc_net_probedscp() { +isc_net_probedscp(void) { return (0); } diff --git a/lib/isc/win32/ntpaths.c b/lib/isc/win32/ntpaths.c index 1ff8c5a9b5..b49dece54a 100644 --- a/lib/isc/win32/ntpaths.c +++ b/lib/isc/win32/ntpaths.c @@ -50,7 +50,7 @@ static DWORD baseLen = MAX_PATH; static BOOL Initialized = FALSE; void -isc_ntpaths_init() { +isc_ntpaths_init(void) { HKEY hKey; BOOL keyFound = TRUE; diff --git a/lib/isc/win32/socket.c b/lib/isc/win32/socket.c index 69e852a87e..aa347bba79 100644 --- a/lib/isc/win32/socket.c +++ b/lib/isc/win32/socket.c @@ -4072,7 +4072,7 @@ error: */ isc_result_t -isc__socket_register() { +isc__socket_register(void) { return (ISC_R_SUCCESS); } diff --git a/lib/isc/win32/syslog.c b/lib/isc/win32/syslog.c index 375784f477..7c888fafd4 100644 --- a/lib/isc/win32/syslog.c +++ b/lib/isc/win32/syslog.c @@ -138,7 +138,7 @@ openlog(const char *name, int flags, ...) { * In fact if we failed then we would have nowhere to put the message */ void -closelog() { +closelog(void) { DeregisterEventSource(hAppLog); }