libdns refactoring: get rid of two versions of dns_client_createx

diff --git a/bin/delv/delv.c b/bin/delv/delv.c
index 100f03c6d92fef13cc3201fbf6fc815dad94e600..af9fa4b77ec8cec46fe109e4b53b59006edfecd2 100644 (file)
--- 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 70659fbf8f12dc86521362a5c412d8c5cf0dd68b..0d1cf47cbd6a9373b3180d20df000914a9ef4cbf 100644 (file)
--- 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 d9e6cc20150fa6be60517b0e1e5d51e4cd2b13f6..d1a57792ab6dc7eec6c886de0ed206b200492124 100644 (file)
--- 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 440af9b98a565e45178ba212de5f76fd89059ac2..45b2af1da0625b33be8a2b5d646f520c623fc327 100644 (file)
--- 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 c7077f18f7dd8716130f3883e490d5c1e02f0ea6..f53b42d651ab99694623427a318dba52bc37ad71 100644 (file)
--- 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 5cdcee52eaff56c40442e12f407e7cfadb94a85b..ec3c9dc2ae3803c06cb94b8c735e58d83b1fce1f 100644 (file)
--- 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 ff0946386e8f66244364c1558d461240f0502d83..0c6849c72ee7726202eb8496cd274f27ee96204f 100644 (file)
--- 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 0db3344c1f51ef21ee98afaac04eae418e2bd530..f24e15ad9146707c5916603f4526eea3bc66a684 100644 (file)
--- 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);