ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

silence compiler warnings [RT #17079]

Browse Source
This commit is contained in:
Mark Andrews
2009-02-17 03:43:07 +00:00
parent 3b14986bdf
commit e48608e085
2 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
bin/named/statschannel.c
View File

@@ -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

15
lib/bind9/check.c
View File

@@ -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);