mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-09-05 08:45:22 +00:00
Code Issues Releases Wiki Activity

C tools: rename __unused macro to unused

Browse Source 
Bug: https://bugzilla.novell.com/show_bug.cgi?id=895495

We define the __unused macro as a shortcut for __attribute__((unused))
to quiet compiler warnings for functions where an argument is unused,
for whatever reason. However, on 64 bit architectures, older glibc's
bits/stat.h header defines an array variable with the name __unused
that collides with our macro and causes the parser to fail to build,
because the resulting macro expansion generates invalid C code.

This commit fixes the issue by removing the __unused macro where it's
not needed (mod_apparmor) and renaming it to 'unused' elsewhere. It also
in some instances reorders the arguments so that the unused macro
appears last consistently.

Signed-off-by: Steve Beattie <steve@nxnw.org>
Acked-by: Seth Arnold <seth.arnold@canonical.com>
Acked-by: John Johansen <john.johansen@canonical.com>
Acked-by: Tyler Hicks <tyhicks@canonical.com>
This commit is contained in:
Steve Beattie
2014-10-02 12:58:54 -07:00
parent ce70c84f5c
commit a44b6ce0a2
14 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
parser/parser_symtab.c
View File

@@ -495,7 +495,7 @@ out:
return retval;
}
static void expand_variable(const void *nodep, VISIT value, int __unused level)
static void expand_variable(const void *nodep, VISIT value, int level unused)
{
struct symtab **t = (struct symtab **) nodep;
@@ -547,7 +547,7 @@ static void __dump_symtab_entry(struct symtab *entry, int do_expanded)
}
}
static void dump_symtab_entry(const void *nodep, VISIT value, int __unused level)
static void dump_symtab_entry(const void *nodep, VISIT value, int level unused)
{
struct symtab **t = (struct symtab **) nodep;
@@ -557,7 +557,7 @@ static void dump_symtab_entry(const void *nodep, VISIT value, int __unused level
__dump_symtab_entry(*t, 0);
}
static void dump_expanded_symtab_entry(const void *nodep, VISIT value, int __unused level)
static void dump_expanded_symtab_entry(const void *nodep, VISIT value, int level unused)
{
struct symtab **t = (struct symtab **) nodep;