]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUILD: log: silent build warnings due to unchecked __objt_{server,applet}
authorWilly Tarreau <w@1wt.eu>
Thu, 20 Sep 2018 09:13:58 +0000 (11:13 +0200)
committerWilly Tarreau <w@1wt.eu>
Thu, 20 Sep 2018 09:42:15 +0000 (11:42 +0200)
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.

src/log.c

index 33586cf24e675661c13472a5790a23326ee86b70..32308fa020ade346e3b2d0e1ef506d691f39cdd7 100644 (file)
--- 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>";