From: Willy Tarreau <w@1wt.eu>
Date: Thu, 20 Sep 2018 09:13:58 +0000 (+0200)
Subject: BUILD: log: silent build warnings due to unchecked __objt_{server,applet}
X-Git-Tag: v1.9-dev3~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1aaf3242274496fce27f93c1cfaa1a085063033a;p=thirdparty%2Fhaproxy.git

BUILD: log: silent build warnings due to unchecked __objt_{server,applet}

These ones are safe to use there since the same check is performed in
the switch/case they're used it. Let's use the unguarded versions
instead.
---

diff --git a/src/log.c b/src/log.c
index 33586cf24e..32308fa020 100644
--- a/src/log.c
+++ b/src/log.c
@@ -2016,10 +2016,10 @@ int sess_build_logline(struct session *sess, struct stream *s, char *dst, size_t
 			case LOG_FMT_SERVER: // %s
 				switch (obj_type(s ? s->target : NULL)) {
 				case OBJ_TYPE_SERVER:
-					src = objt_server(s->target)->id;
+					src = __objt_server(s->target)->id;
 					break;
 				case OBJ_TYPE_APPLET:
-					src = objt_applet(s->target)->name;
+					src = __objt_applet(s->target)->name;
 					break;
 				default:
 					src = "<NOSRV>";