]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUILD: halog: misleading indentation in halog.c
authorWilliam Lallemand <wlallemand@haproxy.com>
Fri, 26 Sep 2025 13:58:49 +0000 (15:58 +0200)
committerWilliam Lallemand <wlallemand@haproxy.com>
Fri, 26 Sep 2025 14:01:50 +0000 (16:01 +0200)
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.

admin/halog/halog.c

index bbed5b81f23e38d81a34484de713691d8e778ea0..5b6296033f1a816882ffa5162b7c237d98a6ed17 100644 (file)
@@ -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;