From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Thu, 19 Aug 2021 14:59:05 +0000 (+0200)
Subject: trie_del: use KNOT_EOK instead of kr_ok()
X-Git-Tag: v5.4.2~1^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8bb50304294d3be868f508f155e07dfc2ca018ab;p=thirdparty%2Fknot-resolver.git

trie_del: use KNOT_EOK instead of kr_ok()
---

diff --git a/daemon/http.c b/daemon/http.c
index e2c1783f4..149bdfef8 100644
--- a/daemon/http.c
+++ b/daemon/http.c
@@ -543,7 +543,7 @@ static int on_stream_close_callback(nghttp2_session *h2, int32_t stream_id,
 		http_cleanup_stream(ctx);
 
 	ret = trie_del(ctx->stream_write_data, (char *)&stream_id, sizeof(stream_id), (trie_val_t*)&data);
-	if (ret == kr_ok() && data)
+	if (ret == KNOT_EOK && data)
 		on_pkt_write(data, error_code == 0 ? 0 : kr_error(EIO));
 
 	return 0;
diff --git a/daemon/session.c b/daemon/session.c
index c1e23b929..3e530b705 100644
--- a/daemon/session.c
+++ b/daemon/session.c
@@ -195,7 +195,7 @@ int session_tasklist_del(struct session *session, struct qr_task *task)
 		key_len = sizeof(char *);
 	}
 	int ret = trie_del(t, key, key_len, &val);
-	if (ret == kr_ok()) {
+	if (ret == KNOT_EOK) {
 		kr_require(val == task);
 		worker_task_unref(val);
 	}
@@ -212,7 +212,7 @@ struct qr_task *session_tasklist_del_first(struct session *session, bool deref)
 {
 	trie_val_t val = NULL;
 	int res = trie_del_first(session->tasks, NULL, NULL, &val);
-	if (res != kr_ok()) {
+	if (res != KNOT_EOK) {
 		val = NULL;
 	} else if (deref) {
 		worker_task_unref(val);
@@ -229,7 +229,7 @@ struct qr_task* session_tasklist_del_msgid(const struct session *session, uint16
 	size_t key_len = sizeof(msg_id);
 	trie_val_t val;
 	int res = trie_del(t, key, key_len, &val);
-	if (res == kr_ok()) {
+	if (res == KNOT_EOK) {
 		if (worker_task_numrefs(val) > 1) {
 			ret = val;
 		}
diff --git a/daemon/tls.c b/daemon/tls.c
index 935870dfd..317a008ff 100644
--- a/daemon/tls.c
+++ b/daemon/tls.c
@@ -894,7 +894,7 @@ int tls_client_param_remove(tls_client_params_t *params, const struct sockaddr *
 		return kr_error(EINVAL);
 	trie_val_t param_ptr;
 	int ret = trie_del(params, key, len, &param_ptr);
-	if (ret)
+	if (ret != KNOT_EOK)
 		return kr_error(ret);
 	tls_client_param_unref(param_ptr);
 	return kr_ok();
diff --git a/lib/generic/test_trie.c b/lib/generic/test_trie.c
index 6740948e9..c71005aed 100644
--- a/lib/generic/test_trie.c
+++ b/lib/generic/test_trie.c
@@ -107,7 +107,7 @@ static void test_queue(void **state)
 		char key_buf[len];
 		ptrdiff_t key_i_new;
 		int ret = trie_del_first(t, key_buf, &len, (trie_val_t *)&key_i_new);
-		assert_int_equal(ret, kr_ok());
+		assert_int_equal(ret, KNOT_EOK);
 		assert_int_equal(KEY_LEN(key_buf), len);
 		assert_int_equal(key_i, key_i_new);
 		assert_string_equal(dict[key_i], key_buf);