CLEANUP: peers: remove unused sock_init_arg struct member

Since be0688c6 ("MEDIUM: stream_interface: remove the si->init"),
sock_init_arg is completely useless (set but never used later), thus
we remove it.

diff --git a/include/haproxy/peers-t.h b/include/haproxy/peers-t.h
index 124fac33abb9d27ed3869ca6125793f9fa13c53e..0bf1c9f46a0fcc156923fa2106886769cba0aa15 100644 (file)
--- a/include/haproxy/peers-t.h
+++ b/include/haproxy/peers-t.h
@@ -62,7 +62,6 @@ struct peer {
        struct sockaddr_storage addr; /* peer address */
        struct protocol *proto;       /* peer address protocol */
        struct xprt_ops *xprt;        /* peer socket operations at transport layer */
-       void *sock_init_arg;          /* socket operations's opaque init argument if needed */
        unsigned int flags;           /* peer session flags */
        unsigned int statuscode;      /* current/last session status code */
        unsigned int reconnect;       /* next connect timer */

diff --git a/src/cfgparse.c b/src/cfgparse.c
index b27eb2aa34fcba2064273fd6fd045749b487481a..b15b1ece77fd0ba5d0e60347c140a729ca15112d 100644 (file)
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -634,7 +634,6 @@ static struct peer *cfg_peers_add_peer(struct peers *peers,
        p->conf.line = linenum;
        p->last_change = ns_to_sec(now_ns);
        p->xprt  = xprt_get(XPRT_RAW);
-       p->sock_init_arg = NULL;
        HA_SPIN_INIT(&p->lock);
        if (id)
                p->id = strdup(id);
@@ -911,7 +910,6 @@ int cfg_parse_peers(const char *file, int linenum, char **args, int kwm)
                }
 
                newpeer->xprt  = xprt_get(XPRT_RAW);
-               newpeer->sock_init_arg = NULL;
                HA_SPIN_INIT(&newpeer->lock);
 
                newpeer->srv = curpeers->peers_fe->srv;