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

CLEANUP: listener: remove unused conf->file and conf->line

Browse Source 
These ones are already in bind_conf.
This commit is contained in:
Willy Tarreau 2012-09-13 19:34:38 +02:00
parent 2a65ff014e
commit 88500de69e
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/types/listener.h
View File

@ -152,8 +152,6 @@ struct listener {
/* warning: this struct is huge, keep it at the bottom */
struct sockaddr_storage addr; /* the address we listen to */
struct {
const char *file; /* file where the section appears */
int line; /* line where the section appears */
struct eb32_node id; /* place in the tree of used IDs */
} conf; /* config information */
};

6
src/cfgparse.c
View File

@ -1455,8 +1455,6 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm)
}
new = curproxy->listen;
while (new != last) {
new->conf.file = file;
new->conf.line = linenum;
new = new->next;
global.maxsock++;
}
@ -1702,8 +1700,6 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm)
new_listen = curproxy->listen;
while (new_listen != last_listen) {
new_listen->conf.file = file;
new_listen->conf.line = linenum;
new_listen->bind_conf = bind_conf;
new_listen = new_listen->next;
global.maxsock++;
@ -2054,7 +2050,7 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm)
if (node) {
l = container_of(node, struct listener, conf.id);
Alert("parsing [%s:%d]: custom id %d for socket '%s' already used at %s:%d.\n",
file, linenum, l->luid, args[1], l->conf.file, l->conf.line);
file, linenum, l->luid, args[1], l->bind_conf->file, l->bind_conf->line);
err_code |= ERR_ALERT | ERR_FATAL;
goto out;
}