From e48608e08516ca90554eb7db8ad5aba40cf3df2a Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Tue, 17 Feb 2009 03:43:07 +0000 Subject: [PATCH] silence compiler warnings [RT #17079] --- bin/named/statschannel.c | 18 +++++++++--------- lib/bind9/check.c | 15 +++++++++++---- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/bin/named/statschannel.c b/bin/named/statschannel.c index 2191452ca3..81f40bb2d1 100644 --- a/bin/named/statschannel.c +++ b/bin/named/statschannel.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: statschannel.c,v 1.14.64.5 2009/01/29 23:47:44 tbox Exp $ */ +/* $Id: statschannel.c,v 1.14.64.6 2009/02/17 03:43:07 marka Exp $ */ /*! \file */ @@ -129,10 +129,10 @@ init_desc(void) { int i; /* Initialize name server statistics */ - memset(nsstats_desc, 0, + memset((void *)nsstats_desc, 0, dns_nsstatscounter_max * sizeof(nsstats_desc[0])); #ifdef HAVE_LIBXML2 - memset(nsstats_xmldesc, 0, + memset((void *)nsstats_xmldesc, 0, dns_nsstatscounter_max * sizeof(nsstats_xmldesc[0])); #endif @@ -197,10 +197,10 @@ init_desc(void) { INSIST(i == dns_nsstatscounter_max); /* Initialize resolver statistics */ - memset(resstats_desc, 0, + memset((void *)resstats_desc, 0, dns_resstatscounter_max * sizeof(resstats_desc[0])); #ifdef HAVE_LIBXML2 - memset(resstats_xmldesc, 0, + memset((void *)resstats_xmldesc, 0, dns_resstatscounter_max * sizeof(resstats_xmldesc[0])); #endif @@ -267,10 +267,10 @@ init_desc(void) { INSIST(i == dns_resstatscounter_max); /* Initialize zone statistics */ - memset(zonestats_desc, 0, + memset((void *)zonestats_desc, 0, dns_zonestatscounter_max * sizeof(zonestats_desc[0])); #ifdef HAVE_LIBXML2 - memset(zonestats_xmldesc, 0, + memset((void *)zonestats_xmldesc, 0, dns_zonestatscounter_max * sizeof(zonestats_xmldesc[0])); #endif @@ -299,10 +299,10 @@ init_desc(void) { INSIST(i == dns_zonestatscounter_max); /* Initialize socket statistics */ - memset(sockstats_desc, 0, + memset((void *)sockstats_desc, 0, isc_sockstatscounter_max * sizeof(sockstats_desc[0])); #ifdef HAVE_LIBXML2 - memset(sockstats_xmldesc, 0, + memset((void *)sockstats_xmldesc, 0, isc_sockstatscounter_max * sizeof(sockstats_xmldesc[0])); #endif diff --git a/lib/bind9/check.c b/lib/bind9/check.c index 7b9056e81f..800cbf9bcd 100644 --- a/lib/bind9/check.c +++ b/lib/bind9/check.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: check.c,v 1.95.12.2 2009/01/18 23:47:35 tbox Exp $ */ +/* $Id: check.c,v 1.95.12.3 2009/02/17 03:43:07 marka Exp $ */ /*! \file */ @@ -909,8 +909,11 @@ validate_masters(const cfg_obj_t *obj, const cfg_obj_t *config, if (new == NULL) goto cleanup; if (stackcount != 0) { + void *ptr; + + DE_CONST(stack, ptr); memcpy(new, stack, oldsize); - isc_mem_put(mctx, stack, oldsize); + isc_mem_put(mctx, ptr, oldsize); } stack = new; stackcount = newlen; @@ -923,8 +926,12 @@ validate_masters(const cfg_obj_t *obj, const cfg_obj_t *config, goto resume; } cleanup: - if (stack != NULL) - isc_mem_put(mctx, stack, stackcount * sizeof(*stack)); + if (stack != NULL) { + void *ptr; + + DE_CONST(stack, ptr); + isc_mem_put(mctx, ptr, stackcount * sizeof(*stack)); + } isc_symtab_destroy(&symtab); *countp = count; return (result);