From 76e17b54ea23c6618cdf4605cd7e893d741e1d7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Witold=20Kr=C4=99cicki?= Date: Tue, 3 Apr 2018 13:15:16 +0200 Subject: [PATCH] libdns refactoring: get rid of two versions of dns_client_createx --- bin/delv/delv.c | 4 ++-- lib/dns/client.c | 23 ++++++----------------- lib/dns/include/dns/client.h | 15 +++++---------- lib/dns/win32/libdns.def.in | 1 - lib/irs/context.c | 2 +- lib/samples/nsprobe.c | 2 +- lib/samples/resolve.c | 2 +- lib/samples/sample-async.c | 2 +- 8 files changed, 17 insertions(+), 34 deletions(-) diff --git a/bin/delv/delv.c b/bin/delv/delv.c index 100f03c6d9..af9fa4b77e 100644 --- a/bin/delv/delv.c +++ b/bin/delv/delv.c @@ -1624,8 +1624,8 @@ main(int argc, char *argv[]) { /* Create client */ clopt = DNS_CLIENTCREATEOPT_USECACHE; - result = dns_client_createx2(mctx, actx, taskmgr, socketmgr, timermgr, - clopt, &client, srcaddr4, srcaddr6); + result = dns_client_createx(mctx, actx, taskmgr, socketmgr, timermgr, + clopt, &client, srcaddr4, srcaddr6); if (result != ISC_R_SUCCESS) { delv_log(ISC_LOG_ERROR, "dns_client_create: %s", isc_result_totext(result)); diff --git a/lib/dns/client.c b/lib/dns/client.c index 70659fbf8f..0d1cf47cbd 100644 --- a/lib/dns/client.c +++ b/lib/dns/client.c @@ -399,7 +399,7 @@ dns_client_create(dns_client_t **clientp, unsigned int options) { isc_log_setdebuglevel(lctx, logdebuglevel); #endif result = dns_client_createx(mctx, actx, taskmgr, socketmgr, timermgr, - options, clientp); + options, clientp, NULL, NULL); if (result != ISC_R_SUCCESS) goto cleanup; @@ -425,22 +425,11 @@ dns_client_create(dns_client_t **clientp, unsigned int options) { } isc_result_t -dns_client_createx(isc_mem_t *mctx, isc_appctx_t *actx, isc_taskmgr_t *taskmgr, - isc_socketmgr_t *socketmgr, isc_timermgr_t *timermgr, - unsigned int options, dns_client_t **clientp) -{ - isc_result_t result; - result = dns_client_createx2(mctx, actx, taskmgr, socketmgr, timermgr, - options, clientp, NULL, NULL); - return (result); -} - -isc_result_t -dns_client_createx2(isc_mem_t *mctx, isc_appctx_t *actx, - isc_taskmgr_t *taskmgr, isc_socketmgr_t *socketmgr, - isc_timermgr_t *timermgr, unsigned int options, - dns_client_t **clientp, const isc_sockaddr_t *localaddr4, - const isc_sockaddr_t *localaddr6) +dns_client_createx(isc_mem_t *mctx, isc_appctx_t *actx, + isc_taskmgr_t *taskmgr, isc_socketmgr_t *socketmgr, + isc_timermgr_t *timermgr, unsigned int options, + dns_client_t **clientp, const isc_sockaddr_t *localaddr4, + const isc_sockaddr_t *localaddr6) { dns_client_t *client; isc_result_t result; diff --git a/lib/dns/include/dns/client.h b/lib/dns/include/dns/client.h index d9e6cc2015..d1a57792ab 100644 --- a/lib/dns/include/dns/client.h +++ b/lib/dns/include/dns/client.h @@ -162,16 +162,11 @@ isc_result_t dns_client_create(dns_client_t **clientp, unsigned int options); isc_result_t -dns_client_createx(isc_mem_t *mctx, isc_appctx_t *actx, isc_taskmgr_t *taskmgr, - isc_socketmgr_t *socketmgr, isc_timermgr_t *timermgr, - unsigned int options, dns_client_t **clientp); - -isc_result_t -dns_client_createx2(isc_mem_t *mctx, isc_appctx_t *actx, - isc_taskmgr_t *taskmgr, isc_socketmgr_t *socketmgr, - isc_timermgr_t *timermgr, unsigned int options, - dns_client_t **clientp, const isc_sockaddr_t *localaddr4, - const isc_sockaddr_t *localaddr6); +dns_client_createx(isc_mem_t *mctx, isc_appctx_t *actx, + isc_taskmgr_t *taskmgr, isc_socketmgr_t *socketmgr, + isc_timermgr_t *timermgr, unsigned int options, + dns_client_t **clientp, const isc_sockaddr_t *localaddr4, + const isc_sockaddr_t *localaddr6); /*%< * Create a DNS client. These functions create a new client object with * minimal internal resources such as the default 'view' for the IN class and diff --git a/lib/dns/win32/libdns.def.in b/lib/dns/win32/libdns.def.in index 440af9b98a..45b2af1da0 100644 --- a/lib/dns/win32/libdns.def.in +++ b/lib/dns/win32/libdns.def.in @@ -138,7 +138,6 @@ dns_client_cancelupdate dns_client_clearservers dns_client_create dns_client_createx -dns_client_createx2 dns_client_destroy dns_client_destroyreqtrans dns_client_destroyrestrans diff --git a/lib/irs/context.c b/lib/irs/context.c index c7077f18f7..f53b42d651 100644 --- a/lib/irs/context.c +++ b/lib/irs/context.c @@ -254,7 +254,7 @@ irs_context_create(irs_context_t **contextp) { /* Create a DNS client object */ result = dns_client_createx(mctx, actx, taskmgr, socketmgr, timermgr, - 0, &client); + 0, &client, NULL, NULL); if (result != ISC_R_SUCCESS) goto fail; context->dnsclient = client; diff --git a/lib/samples/nsprobe.c b/lib/samples/nsprobe.c index 5cdcee52ea..ec3c9dc2ae 100644 --- a/lib/samples/nsprobe.c +++ b/lib/samples/nsprobe.c @@ -1077,7 +1077,7 @@ main(int argc, char *argv[]) { isc_app_ctxstart(actx); result = dns_client_createx(mctx, actx, taskmgr, socketmgr, - timermgr, 0, &client); + timermgr, 0, &client, NULL, NULL); if (result != ISC_R_SUCCESS) { fprintf(stderr, "dns_client_createx failed: %u\n", result); exit(1); diff --git a/lib/samples/resolve.c b/lib/samples/resolve.c index ff0946386e..0c6849c72e 100644 --- a/lib/samples/resolve.c +++ b/lib/samples/resolve.c @@ -393,7 +393,7 @@ main(int argc, char *argv[]) { goto cleanup; clientopt = 0; - result = dns_client_createx2(mctx, actx, taskmgr, socketmgr, timermgr, + result = dns_client_createx(mctx, actx, taskmgr, socketmgr, timermgr, clientopt, &client, addr4, addr6); if (result != ISC_R_SUCCESS) { fprintf(stderr, "dns_client_create failed: %u, %s\n", result, diff --git a/lib/samples/sample-async.c b/lib/samples/sample-async.c index 0db3344c1f..f24e15ad91 100644 --- a/lib/samples/sample-async.c +++ b/lib/samples/sample-async.c @@ -340,7 +340,7 @@ main(int argc, char *argv[]) { isc_app_ctxstart(query_actx); result = dns_client_createx(mctx, query_actx, taskmgr, socketmgr, - timermgr, 0, &client); + timermgr, 0, &client, NULL, NULL); if (result != ISC_R_SUCCESS) { fprintf(stderr, "dns_client_createx failed: %u\n", result); exit(1);