From fcb53fbb58b1ce8d701f81dfd6bdeda1c82cb2d1 Mon Sep 17 00:00:00 2001
From: Christopher Faulet <cfaulet@haproxy.com>
Date: Mon, 15 Feb 2021 12:07:40 +0100
Subject: [PATCH] CLEANUP: server: Rename state_line node to node instead of
name_name
<state_line.name_name> field is a node in an eb-tree. Thus, instead of
"name_name", we now use "node" to name this field. If is a more explicit
name and not too strange.
---
include/haproxy/server-t.h | 4 ++--
src/server.c | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/haproxy/server-t.h b/include/haproxy/server-t.h
index d752ac37a..c3d5b1212 100644
--- a/include/haproxy/server-t.h
+++ b/include/haproxy/server-t.h
@@ -377,8 +377,8 @@ struct server {
*/
struct state_line {
char *line;
- struct ebmb_node name_name;
- /* WARNING don't put anything after name_name, it's used by the key */
+ struct ebmb_node node;
+ /* WARNING don't put anything after node, it's used by the key */
};
diff --git a/src/server.c b/src/server.c
index 6b2af88b3..5e23580e6 100644
--- a/src/server.c
+++ b/src/server.c
@@ -3273,8 +3273,8 @@ void apply_server_state(void)
if (st == NULL) {
goto nextline;
}
- memcpy(st->name_name.key, trash.area, trash.data + 1);
- if (ebst_insert(&state_file, &st->name_name) != &st->name_name) {
+ memcpy(st->node.key, trash.area, trash.data + 1);
+ if (ebst_insert(&state_file, &st->node) != &st->node) {
/* this is a duplicate key, probably a hand-crafted file,
* drop it!
*/
@@ -3321,7 +3321,7 @@ void apply_server_state(void)
node = ebst_lookup(&state_file, trash.area);
if (!node)
continue; /* next server */
- st = ebmb_entry(node, struct state_line, name_name);
+ st = ebmb_entry(node, struct state_line, node);
strcpy(mybuf, st->line); /* st->line is always small enough */
ret = srv_state_parse_line(mybuf, global_vsn, params);
@@ -3415,7 +3415,7 @@ void apply_server_state(void)
node = ebmb_first(&state_file);
while (node) {
- st = ebmb_entry(node, struct state_line, name_name);
+ st = ebmb_entry(node, struct state_line, node);
next_node = ebmb_next(node);
ebmb_delete(node);
free(st->line);