Re: [PATCH 2/6]kernel:audit.c Fix warning: variable 'nlh' set but not used

[Geert Uytterhoeven]

On Fri, Jun 11, 2010 at 22:41, Justin P. Mattock
<justinmattock@xxxxxxxxx> wrote:
> Removing dead code(hopefully), fixes a warning

This is not dead code. NLMSG_NEW() sets up an nlmsg in ab->skb.
If you remove the code, it's no longer initialized.

> when compiling the kernel.
>
> ÂCC Â Â Âkernel/audit.o
> kernel/audit.c: In function 'audit_buffer_alloc':
> kernel/audit.c:1044:19: warning: variable 'nlh' set but not used
> ÂCC Â Â Âkernel/auditfilter.o
>
> ÂSigned-off-by: Justin P. Mattock <justinmattock@xxxxxxxxx>
>
> ---
> Âkernel/audit.c | Â Â6 ++----
> Â1 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/kernel/audit.c b/kernel/audit.c
> index c71bd26..783d958 100644
> --- a/kernel/audit.c
> +++ b/kernel/audit.c
> @@ -1041,8 +1041,7 @@ static struct audit_buffer * audit_buffer_alloc(struct audit_context *ctx,
> Â{
> Â Â Â Âunsigned long flags;
> Â Â Â Âstruct audit_buffer *ab = NULL;
> - Â Â Â struct nlmsghdr *nlh;
> -
> +
> Â Â Â Âspin_lock_irqsave(&audit_freelist_lock, flags);
> Â Â Â Âif (!list_empty(&audit_freelist)) {
> Â Â Â Â Â Â Â Âab = list_entry(audit_freelist.next,
> @@ -1065,8 +1064,7 @@ static struct audit_buffer * audit_buffer_alloc(struct audit_context *ctx,
> Â Â Â Âif (!ab->skb)
> Â Â Â Â Â Â Â Âgoto nlmsg_failure;
>
> - Â Â Â nlh = NLMSG_NEW(ab->skb, 0, 0, type, 0, 0);
> -
> +
> Â Â Â Âreturn ab;
>
> Ânlmsg_failure: Â Â Â Â Â Â Â Â Â/* Used by NLMSG_NEW */

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/