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

parser: convert subset flag to a bool

Browse Source 
Signed-off-by: John Johansen <john.johansen@canonical.com>
This commit is contained in:
John Johansen 2021-09-08 02:50:31 -07:00
parent c36d4e9c03
commit f76d134b6c
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
parser/parser.h
View File

@ -128,7 +128,7 @@ struct cod_entry {
bool alias_ignore; /* ignore for alias processing */ bool alias_ignore; /* ignore for alias processing */
int subset; bool subset;
pattern_t pattern_type; pattern_t pattern_type;
struct cod_pattern pat; struct cod_pattern pat;

2
parser/parser_merge.c
View File

@ -44,7 +44,7 @@ static int file_comp(const void *c1, const void *c2)
return res; return res;
if ((*e1)->link_name) if ((*e1)->link_name)
res = (*e2)->subset - (*e1)->subset; res = ((int) (*e2)->subset) - ((int) (*e1)->subset);
if (res) if (res)
return res; return res;

6
parser/parser_yacc.y
View File

@ -648,9 +648,9 @@ flagval: TOK_VALUE
$$ = fv; $$ = fv;
}; };
opt_subset_flag: { /* nothing */ $$ = 0; } opt_subset_flag: { /* nothing */ $$ = false; }
| TOK_SUBSET { $$ = 1; } | TOK_SUBSET { $$ = true; }
| TOK_LE { $$ = 1; } | TOK_LE { $$ = true; }
opt_audit_flag: { /* nothing */ $$ = AUDIT_UNSPECIFIED; } opt_audit_flag: { /* nothing */ $$ = AUDIT_UNSPECIFIED; }
| TOK_AUDIT { $$ = AUDIT_FORCE; }; | TOK_AUDIT { $$ = AUDIT_FORCE; };