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.

diff --git a/include/haproxy/server-t.h b/include/haproxy/server-t.h
index d752ac37a4dfe34d1c91c20d17efc82b0e94d486..c3d5b121298d74c4981e22ea527cc619e8d8d400 100644 (file)
--- 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 6b2af88b3a16beab32ed62681661f20b42b3b8f2..5e23580e66b6da29906aaf1896b9f6f3db7ef687 100644 (file)
--- 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);