Adjust the nstests for isc_nmhandle_{attach,detach} name change

Due to the added attach/detach tracing in the netmgr-v2 code, the
libns tests needs to be adjusted as the real function names have
changed from isc_nmhandle_* to isc__nmhandle_*.

diff --git a/lib/ns/tests/Makefile.in b/lib/ns/tests/Makefile.in
index ef1c1a6385d961d0edd51ed69d7d42c2a679c3c9..4c3e69498a7e4beea3e87e78b20fd79c88289a07 100644 (file)
--- a/lib/ns/tests/Makefile.in
+++ b/lib/ns/tests/Makefile.in
@@ -15,7 +15,7 @@ VERSION=@BIND9_VERSION@
 
 @BIND9_MAKE_INCLUDES@
 
-WRAP_OPTIONS = -Wl,--wrap=isc_nmhandle_detach -Wl,--wrap=isc_nmhandle_attach
+WRAP_OPTIONS = -Wl,--wrap=isc__nmhandle_detach -Wl,--wrap=isc__nmhandle_attach
 
 CINCLUDES =    -I. -Iinclude ${NS_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} \
                ${OPENSSL_CFLAGS} \

diff --git a/lib/ns/tests/nstest.c b/lib/ns/tests/nstest.c
index 36a627966827ca3870e8a8929633f43b6667203d..835d266bfb2b8be2d7ab99ca7f9574a8ad841ede 100644 (file)
--- a/lib/ns/tests/nstest.c
+++ b/lib/ns/tests/nstest.c
@@ -78,12 +78,12 @@ atomic_uint_fast32_t client_refs[32];
 atomic_uintptr_t client_addrs[32];
 
 void
-__wrap_isc_nmhandle_attach(isc_nmhandle_t *source, isc_nmhandle_t **targetp);
+__wrap_isc__nmhandle_attach(isc_nmhandle_t *source, isc_nmhandle_t **targetp);
 void
-__wrap_isc_nmhandle_detach(isc_nmhandle_t **handlep);
+__wrap_isc__nmhandle_detach(isc_nmhandle_t **handlep);
 
 void
-__wrap_isc_nmhandle_attach(isc_nmhandle_t *source, isc_nmhandle_t **targetp) {
+__wrap_isc__nmhandle_attach(isc_nmhandle_t *source, isc_nmhandle_t **targetp) {
        ns_client_t *client = (ns_client_t *)source;
        int i;
 
@@ -102,7 +102,7 @@ __wrap_isc_nmhandle_attach(isc_nmhandle_t *source, isc_nmhandle_t **targetp) {
 }
 
 void
-__wrap_isc_nmhandle_detach(isc_nmhandle_t **handlep) {
+__wrap_isc__nmhandle_detach(isc_nmhandle_t **handlep) {
        isc_nmhandle_t *handle = *handlep;
        ns_client_t *client = (ns_client_t *)handle;
        int i;
@@ -129,12 +129,12 @@ __wrap_isc_nmhandle_detach(isc_nmhandle_t **handlep) {
 
 #ifdef USE_LIBTOOL
 void
-isc_nmhandle_attach(isc_nmhandle_t *source, isc_nmhandle_t **targetp) {
-       __wrap_isc_nmhandle_attach(source, targetp);
+isc__nmhandle_attach(isc_nmhandle_t *source, isc_nmhandle_t **targetp) {
+       __wrap_isc__nmhandle_attach(source, targetp);
 }
 void
-isc_nmhandle_detach(isc_nmhandle_t **handle) {
-       __wrap_isc_nmhandle_detach(handle);
+isc__nmhandle_detach(isc_nmhandle_t **handle) {
+       __wrap_isc__nmhandle_detach(handle);
 }
 #endif /* USE_LIBTOOL */