topjohnwu/selinux
1
0
Fork 0
mirror of https://github.com/topjohnwu/selinux.git synced 2024-12-11 13:26:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

libsepol: cosmetic changes to make the source easier to read

Browse Source 
strict adherense to 80 characters means that we split stuff in stupid
places.  Screw 80 characters.  Buy a bigger monitor.

Signed-off-by: Eric Paris <eparis@redhat.com>
Acked-by: Dan Walsh <dwalsh@redhat.com>
This commit is contained in:
Eric Paris 2012-05-29 16:58:35 -04:00
parent 7a1e3e1fef
commit c43f5b1d34
1 changed files with 18 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
libsepol/src/expand.c
View File

@ -1826,58 +1826,36 @@ static int expand_rule_helper(sepol_handle_t * handle,
continue;
if (source_rule->flags & RULE_SELF) {
if (source_rule->specified & AVRULE_AV) {
if ((retval =
expand_avrule_helper(handle,
source_rule->
specified, cond, i, i,
source_rule->perms,
dest_avtab,
enabled)) !=
EXPAND_RULE_SUCCESS) {
retval = expand_avrule_helper(handle, source_rule->specified,
cond, i, i, source_rule->perms,
dest_avtab, enabled);
if (retval != EXPAND_RULE_SUCCESS)
return retval;
}
} else {
if ((retval =
expand_terule_helper(handle, p,
typemap,
source_rule->
specified, cond,
other, i, i,
source_rule->perms,
dest_avtab,
enabled)) !=
EXPAND_RULE_SUCCESS) {
retval = expand_terule_helper(handle, p, typemap,
source_rule->specified, cond,
other, i, i, source_rule->perms,
dest_avtab, enabled);
if (retval != EXPAND_RULE_SUCCESS)
return retval;
}
}
}
ebitmap_for_each_bit(ttypes, tnode, j) {
if (!ebitmap_node_get_bit(tnode, j))
continue;
if (source_rule->specified & AVRULE_AV) {
if ((retval =
expand_avrule_helper(handle,
source_rule->
specified, cond, i, j,
source_rule->perms,
dest_avtab,
enabled)) !=
EXPAND_RULE_SUCCESS) {
retval = expand_avrule_helper(handle, source_rule->specified,
cond, i, j, source_rule->perms,
dest_avtab, enabled);
if (retval != EXPAND_RULE_SUCCESS)
return retval;
}
} else {
if ((retval =
expand_terule_helper(handle, p,
typemap,
source_rule->
specified, cond,
other, i, j,
source_rule->perms,
dest_avtab,
enabled)) !=
EXPAND_RULE_SUCCESS) {
retval = expand_terule_helper(handle, p, typemap,
source_rule->specified, cond,
other, i, j, source_rule->perms,
dest_avtab, enabled);
if (retval != EXPAND_RULE_SUCCESS)
return retval;
}
}
}
}