From: Willy Tarreau <w@1wt.eu>
Date: Thu, 20 Sep 2018 09:26:52 +0000 (+0200)
Subject: BUILD: connection: silence a couple of null-deref build warnings at -Wextra
X-Git-Tag: v1.9-dev3~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=55e0da664eba48caffcd2c37636b68b0fe092cda;p=thirdparty%2Fhaproxy.git

BUILD: connection: silence a couple of null-deref build warnings at -Wextra

These ones don't need to be checked either.
---

diff --git a/include/proto/connection.h b/include/proto/connection.h
index 85c5b633fc..31f82b8b18 100644
--- a/include/proto/connection.h
+++ b/include/proto/connection.h
@@ -1029,7 +1029,7 @@ static inline struct proxy *conn_get_proxy(const struct connection *conn)
  */
 static inline int conn_install_mux_fe(struct connection *conn, void *ctx)
 {
-	struct bind_conf     *bind_conf = objt_listener(conn->target)->bind_conf;
+	struct bind_conf     *bind_conf = __objt_listener(conn->target)->bind_conf;
 	const struct mux_ops *mux_ops;
 
 	if (bind_conf->mux_proto)
diff --git a/src/connection.c b/src/connection.c
index b970d41892..06e1ed840d 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -862,7 +862,7 @@ int conn_recv_netscaler_cip(struct connection *conn, int flag)
 
 	/* Decode a possible NetScaler Client IP request, fail early if
 	 * it does not match */
-	if (ntohl(*(uint32_t *)line) != objt_listener(conn->target)->bind_conf->ns_cip_magic)
+	if (ntohl(*(uint32_t *)line) != __objt_listener(conn->target)->bind_conf->ns_cip_magic)
 		goto bad_magic;
 
 	/* Legacy CIP protocol */