From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Tue, 20 May 2025 06:28:32 +0000 (+0200)
Subject: lib/selection*: avoid using `private` identifier; because C++
X-Git-Tag: v6.0.13~6^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0bdc5aa9c72596c8cf73b7b35834fb13cc25ab55;p=thirdparty%2Fknot-resolver.git

lib/selection*: avoid using `private` identifier; because C++
---

diff --git a/lib/selection.c b/lib/selection.c
index cdef17011..6ba549cd3 100644
--- a/lib/selection.c
+++ b/lib/selection.c
@@ -758,7 +758,7 @@ void kr_server_selection_init(struct kr_query *qry)
 			.local_state = local_state,
 		};
 		forward_local_state_alloc(
-			mempool, &qry->server_selection.local_state->private,
+			mempool, &qry->server_selection.local_state->priv,
 			qry->request);
 	} else {
 		qry->server_selection = (struct kr_server_selection){
@@ -769,7 +769,7 @@ void kr_server_selection_init(struct kr_query *qry)
 			.local_state = local_state,
 		};
 		iter_local_state_alloc(
-			mempool, &qry->server_selection.local_state->private);
+			mempool, &qry->server_selection.local_state->priv);
 	}
 }
 void kr_server_selection_cached(struct kr_query *qry)
diff --git a/lib/selection.h b/lib/selection.h
index 0938e3804..f9488ff88 100644
--- a/lib/selection.h
+++ b/lib/selection.h
@@ -92,7 +92,7 @@ struct local_state {
 	bool force_resolve;
 	/** Used to work around auths with broken TCP. */
 	bool force_udp;
-	void *private; /**< Inner state of the implementation.*/
+	void *priv; /**< Inner state of the implementation.*/
 };
 
 /**
diff --git a/lib/selection_forward.c b/lib/selection_forward.c
index 588fcb363..a99ad24cb 100644
--- a/lib/selection_forward.c
+++ b/lib/selection_forward.c
@@ -38,7 +38,7 @@ void forward_choose_transport(struct kr_query *qry,
 			      struct kr_transport **transport)
 {
 	struct forward_local_state *local_state =
-		qry->server_selection.local_state->private;
+		qry->server_selection.local_state->priv;
 	struct choice choices[local_state->targets->len];
 	int valid = 0;
 
@@ -110,7 +110,7 @@ void forward_error(struct kr_query *qry, const struct kr_transport *transport,
 		return;
 	}
 	struct forward_local_state *local_state =
-		qry->server_selection.local_state->private;
+		qry->server_selection.local_state->priv;
 	struct address_state *addr_state =
 		&local_state->addr_states[local_state->last_choice_index];
 	error(qry, addr_state, transport, sel_error);
@@ -128,7 +128,7 @@ void forward_update_rtt(struct kr_query *qry,
 	}
 
 	struct forward_local_state *local_state =
-		qry->server_selection.local_state->private;
+		qry->server_selection.local_state->priv;
 	struct address_state *addr_state =
 		&local_state->addr_states[local_state->last_choice_index];
 
diff --git a/lib/selection_iter.c b/lib/selection_iter.c
index e0f0f07b0..7153165fd 100644
--- a/lib/selection_iter.c
+++ b/lib/selection_iter.c
@@ -240,7 +240,7 @@ void iter_choose_transport(struct kr_query *qry, struct kr_transport **transport
 	struct knot_mm *mempool = &qry->request->pool;
 	struct iter_local_state *local_state =
 		(struct iter_local_state *)
-			qry->server_selection.local_state->private;
+			qry->server_selection.local_state->priv;
 
 	unpack_state_from_zonecut(local_state, qry);
 
@@ -363,7 +363,7 @@ void iter_error(struct kr_query *qry, const struct kr_transport *transport,
 	if (!qry->server_selection.initialized) {
 		return;
 	}
-	struct iter_local_state *local_state = qry->server_selection.local_state->private;
+	struct iter_local_state *local_state = qry->server_selection.local_state->priv;
 	struct address_state *addr_state = get_address_state(local_state, transport);
 	local_state->last_error = sel_error;
 	error(qry, addr_state, transport, sel_error);
@@ -375,7 +375,7 @@ void iter_update_rtt(struct kr_query *qry, const struct kr_transport *transport,
 	if (!qry->server_selection.initialized) {
 		return;
 	}
-	struct iter_local_state *local_state = qry->server_selection.local_state->private;
+	struct iter_local_state *local_state = qry->server_selection.local_state->priv;
 	struct address_state *addr_state = get_address_state(local_state, transport);
 	update_rtt(qry, addr_state, transport, rtt);
 }