mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-03 16:15:27 +00:00
Code Issues Releases Wiki Activity

silence compiler warnings

Browse Source
This commit is contained in:
Mark Andrews
2005-09-10 01:02:08 +00:00
parent 030aafe411
commit 72bdbe3c70
1 changed files with 36 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
lib/dns/name.c
View File

@@ -15,13 +15,14 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: name.c,v 1.153 2005/09/10 00:31:25 marka Exp $ */ /* $Id: name.c,v 1.154 2005/09/10 01:02:08 marka Exp $ */
/*! \file */ /*! \file */
#include <config.h> #include <config.h>
#include <ctype.h> #include <ctype.h>
#include <stdlib.h>
#include <isc/buffer.h> #include <isc/buffer.h>
#include <isc/hash.h> #include <isc/hash.h>
@@ -1277,7 +1278,7 @@ dns_name_fromtext(dns_name_t *name, isc_buffer_t *source,
#ifdef ISC_PLATFORM_USETHREADS #ifdef ISC_PLATFORM_USETHREADS
static void static void
totext_filter_proc_key_init(void) { totext_filter_proc_key_init(void) {
RUNTIME_CHECK(isc_key_create(&totext_filter_proc_key, NULL) == 0); RUNTIME_CHECK(isc_key_create(&totext_filter_proc_key, free) == 0);
} }
#endif #endif
@@ -1294,7 +1295,8 @@ dns_name_totext(dns_name_t *name, isc_boolean_t omit_final_dot,
isc_boolean_t saw_root = ISC_FALSE; isc_boolean_t saw_root = ISC_FALSE;
unsigned int oused = target->used; unsigned int oused = target->used;
#ifdef ISC_PLATFORM_USETHREADS #ifdef ISC_PLATFORM_USETHREADS
dns_name_totextfilter_t totext_filter_proc; dns_name_totextfilter_t *mem;
dns_name_totextfilter_t totext_filter_proc = NULL;
isc_result_t result; isc_result_t result;
#endif #endif
@@ -1442,7 +1444,10 @@ dns_name_totext(dns_name_t *name, isc_boolean_t omit_final_dot,
isc_buffer_add(target, tlen - trem); isc_buffer_add(target, tlen - trem);
#ifdef ISC_PLATFORM_USETHREADS #ifdef ISC_PLATFORM_USETHREADS
totext_filter_proc = isc_key_getspecific(totext_filter_proc_key);
mem = isc_key_getspecific(totext_filter_proc_key);
if (mem)
totext_filter_proc = *mem;
#endif #endif
if (totext_filter_proc != NULL) if (totext_filter_proc != NULL)
return ((*totext_filter_proc)(target, oused, saw_root)); return ((*totext_filter_proc)(target, oused, saw_root));
@@ -2232,11 +2237,37 @@ isc_result_t
dns_name_settotextfilter(dns_name_totextfilter_t proc) { dns_name_settotextfilter(dns_name_totextfilter_t proc) {
#ifdef ISC_PLATFORM_USETHREADS #ifdef ISC_PLATFORM_USETHREADS
isc_result_t result; isc_result_t result;
dns_name_totextfilter_t *mem;
result = isc_once_do(&once, totext_filter_proc_key_init); result = isc_once_do(&once, totext_filter_proc_key_init);
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
return (result); return (result);
if (isc_key_setspecific(totext_filter_proc_key, proc) != 0)
/*
* If we already have been here set / clear as appropriate.
* Otherwise allocate memory.
*/
mem = isc_key_getspecific(totext_filter_proc_key);
if (mem != NULL && proc != NULL) {
*mem = proc;
return (ISC_R_SUCCESS);
}
if (proc == NULL) {
free(mem);
if (isc_key_setspecific(totext_filter_proc_key, NULL) != 0)
result = ISC_R_UNEXPECTED;
return (result);
}
/*
* We use malloc because Windows can't automatically free the
* memory and we don't want to trigger a INSIST at exit.
*/
mem = malloc(sizeof(dns_name_totextfilter_t));
if (mem == NULL)
return (ISC_R_NOMEMORY);
*mem = proc;
if (isc_key_setspecific(totext_filter_proc_key, mem) != 0)
result = ISC_R_UNEXPECTED; result = ISC_R_UNEXPECTED;
return (result); return (result);
#else #else