mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-21 22:01:31 +02:00
Code Issues Projects Releases Wiki Activity

CLEANUP: server: Rename state_line node to node instead of name_name

Browse Source 
<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.
This commit is contained in:
Christopher Faulet 2021-02-15 12:07:40 +01:00
parent 131b07be3c
commit fcb53fbb58
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/haproxy/server-t.h
View File

@ -377,8 +377,8 @@ struct server {
*/ */
struct state_line { struct state_line {
char *line; char *line;
struct ebmb_node name_name; struct ebmb_node node;
/* WARNING don't put anything after name_name, it's used by the key */ /* WARNING don't put anything after node, it's used by the key */
}; };

8
src/server.c
View File

@ -3273,8 +3273,8 @@ void apply_server_state(void)
if (st == NULL) { if (st == NULL) {
goto nextline; goto nextline;
} }
memcpy(st->name_name.key, trash.area, trash.data + 1); memcpy(st->node.key, trash.area, trash.data + 1);
if (ebst_insert(&state_file, &st->name_name) != &st->name_name) { if (ebst_insert(&state_file, &st->node) != &st->node) {
/* this is a duplicate key, probably a hand-crafted file, /* this is a duplicate key, probably a hand-crafted file,
* drop it! * drop it!
*/ */
@ -3321,7 +3321,7 @@ void apply_server_state(void)
node = ebst_lookup(&state_file, trash.area); node = ebst_lookup(&state_file, trash.area);
if (!node) if (!node)
continue; /* next server */ 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 */ strcpy(mybuf, st->line); /* st->line is always small enough */
ret = srv_state_parse_line(mybuf, global_vsn, params); ret = srv_state_parse_line(mybuf, global_vsn, params);
@ -3415,7 +3415,7 @@ void apply_server_state(void)
node = ebmb_first(&state_file); node = ebmb_first(&state_file);
while (node) { while (node) {
st = ebmb_entry(node, struct state_line, name_name); st = ebmb_entry(node, struct state_line, node);
next_node = ebmb_next(node); next_node = ebmb_next(node);
ebmb_delete(node); ebmb_delete(node);
free(st->line); free(st->line);