From: Karel Slany <karel.slany@nic.cz>
Date: Tue, 26 Jul 2016 10:35:16 +0000 (+0200)
Subject: Renamed kr_resolve_query_finalize() to kr_resolve_checkout().
X-Git-Tag: v1.1.0~2^2~17
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fd380a7258aa324afbc1e44a6f1b3b18fc337bdf;p=thirdparty%2Fknot-resolver.git

Renamed kr_resolve_query_finalize() to kr_resolve_checkout().
---

diff --git a/daemon/worker.c b/daemon/worker.c
index 26dc6d80d..90427f693 100644
--- a/daemon/worker.c
+++ b/daemon/worker.c
@@ -475,9 +475,9 @@ static int qr_task_send(struct qr_task *task, uv_handle_t *handle, struct sockad
 		 * @note -- A solution might be opening a separate socket and
 		 * trying to obtain the IP address from it.
 		 */
-		ret = kr_resolve_query_finalize(&task->req, NULL, addr,
-		                                handle->type == UV_UDP ? SOCK_DGRAM : SOCK_STREAM,
-		                                pkt);
+		ret = kr_resolve_checkout(&task->req, NULL, addr,
+		                          handle->type == UV_UDP ? SOCK_DGRAM : SOCK_STREAM,
+		                          pkt);
 		if (ret != kr_ok()) {
 			return ret;
 		}
diff --git a/lib/resolve.c b/lib/resolve.c
index f6b8dad1d..e42c83328 100644
--- a/lib/resolve.c
+++ b/lib/resolve.c
@@ -768,7 +768,7 @@ ns_election:
 
 	/*
 	 * Additional query is going to be finalised when calling
-	 * kr_resolve_query_finalize().
+	 * kr_resolve_checkout().
 	 */
 
 	gettimeofday(&qry->timestamp, NULL);
@@ -809,8 +809,8 @@ static bool outbound_request_update_cookies(struct kr_request *req,
 }
 #endif /* defined(ENABLE_COOKIES) */
 
-int kr_resolve_query_finalize(struct kr_request *request, struct sockaddr *src,
-                              struct sockaddr *dst, int type, knot_pkt_t *packet)
+int kr_resolve_checkout(struct kr_request *request, struct sockaddr *src,
+                        struct sockaddr *dst, int type, knot_pkt_t *packet)
 {
 	/* @todo: Update documentation if this function becomes approved. */
 
diff --git a/lib/resolve.h b/lib/resolve.h
index fe4349636..31b943368 100644
--- a/lib/resolve.h
+++ b/lib/resolve.h
@@ -178,7 +178,7 @@ KR_EXPORT
 int kr_resolve_produce(struct kr_request *request, struct sockaddr **dst, int *type, knot_pkt_t *packet);
 
 /**
- * Finalises the query with the knowledge of the target (remote server) IP address.
+ * Finalises the outbound query packet with the knowledge of the IP addresses.
  *
  * @note The function must be called before actual sending of the request packet.
  *
@@ -190,8 +190,8 @@ int kr_resolve_produce(struct kr_request *request, struct sockaddr **dst, int *t
  * @return         kr_ok() or error code
  */
 KR_EXPORT
-int kr_resolve_query_finalize(struct kr_request *request, struct sockaddr *src,
-                              struct sockaddr *dst, int type, knot_pkt_t *packet);
+int kr_resolve_checkout(struct kr_request *request, struct sockaddr *src,
+                        struct sockaddr *dst, int type, knot_pkt_t *packet);
 
 /**
  * Finish resolution and commit results if the state is DONE.