From: William Lallemand Date: Fri, 26 Sep 2025 13:58:49 +0000 (+0200) Subject: BUILD: halog: misleading indentation in halog.c X-Git-Tag: v3.3-dev9~30 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f1f5877ce1e7d162045b425b53de382ab9ee217e;p=thirdparty%2Fhaproxy.git BUILD: halog: misleading indentation in halog.c admin/halog/halog.c: In function 'filter_count_url': admin/halog/halog.c:1685:9: error: this 'if' clause does not guard... [-Werror=misleading-indentation] 1685 | if (unlikely(!ustat)) | ^~ admin/halog/halog.c:1687:17: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the 'if' 1687 | if (unlikely(!ustat)) { | ^~ This patch fixes the indentation. Must be backported where fbd0fb20a22 ("BUG/MINOR: halog: Add OOM checks for calloc() in filter_count_srv_status() and filter_count_url()") was backported. --- diff --git a/admin/halog/halog.c b/admin/halog/halog.c index bbed5b81f..5b6296033 100644 --- a/admin/halog/halog.c +++ b/admin/halog/halog.c @@ -1684,10 +1684,10 @@ void filter_count_url(const char *accept_field, const char *time_field, struct t */ if (unlikely(!ustat)) ustat = calloc(1, sizeof(*ustat)); - if (unlikely(!ustat)) { - fprintf(stderr, "%s: not enough memory\n", __FUNCTION__); - exit(1); - } + if (unlikely(!ustat)) { + fprintf(stderr, "%s: not enough memory\n", __FUNCTION__); + exit(1); + } ustat->nb_err = err; ustat->nb_req = 1;