Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20210322162807.679370-1-arnd@kernel.org>
In-Reply-To: <20210322162807.679370-1-arnd@kernel.org>
From:   Paul Moore <paul@paul-moore.com>
Date:   Wed, 24 Mar 2021 12:14:12 -0400
Message-ID: <CAHC9VhQEyA6iy84j=Bryvxwp7EYVN2JibTqMmWHk_hTs6Kkadg@mail.gmail.com>
Subject: Re: [PATCH] [v2] audit: avoid -Wempty-body warning
To:     Arnd Bergmann <arnd@kernel.org>
Cc:     Eric Paris <eparis@redhat.com>, Arnd Bergmann <arnd@arndb.de>,
        Richard Guy Briggs <rgb@redhat.com>,
        Jules Irenge <jbi.octave@gmail.com>, linux-audit@redhat.com,
        linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Mon, Mar 22, 2021 at 12:28 PM Arnd Bergmann <arnd@kernel.org> wrote:
>
> From: Arnd Bergmann <arnd@arndb.de>
>
> gcc warns about an empty statement when audit_remove_mark is defined to
> nothing:
>
> kernel/auditfilter.c: In function 'audit_data_to_entry':
> kernel/auditfilter.c:609:51: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body]
>   609 |                 audit_remove_mark(entry->rule.exe); /* that's the template one */
>       |                                                   ^
>
> Change the macros to use the usual "do { } while (0)" instead, and change a
> few more that were (void)0, for consistency.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> v2: convert two more macros
> ---
>  kernel/audit.h | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)

Merged into audit/next, thanks.

-- 
paul moore
www.paul-moore.com