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

These ones are already in bind_conf.

diff --git a/include/types/listener.h b/include/types/listener.h
index 098532909d135a7654fba5889e9314ae10e94255..24061486ee669050a3e8f739e499c34b979c8ed3 100644 (file)
--- a/include/types/listener.h
+++ b/include/types/listener.h
@@ -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 */
 };

diff --git a/src/cfgparse.c b/src/cfgparse.c
index 8a7b29ae66162a09edd0b02d42e7195ab394380c..07b73471c48a38dcd403ea54fc714cbbaa13f143 100644 (file)
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -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;
                                }