Re: [PATCH 2/6]kernel:audit.c Fix warning: variable 'nlh' set butnot used
From: Justin P. Mattock
Date: Fri Jun 11 2010 - 18:03:39 EST
On 06/11/2010 02:14 PM, Geert Uytterhoeven wrote:
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.
o.k... this one did confuse me a bit, so at the end
I just sent in this one which does remove the function
but does not fix the warning of nlh not being used
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
if you have any ideas/patches then let me know
I can test it out and see.
Justin P. Mattock
--
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/