-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
This patch looks good to me. acked.
This patch just makes source code easier to read.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iEYEARECAAYFAk/JFHMACgkQrlYvE4MpobOynACgz/hN+sP5R0Nu5oB0Vh8xZQ12
T2cAoI3GAha9SiPT3CO57xKmYULbrd4s
=fvMM
-----END PGP SIGNATURE-----
>From 248c4e44ffda93411fb01bcf45b5fc3684b81b8e Mon Sep 17 00:00:00 2001
From: Eric Paris <eparis@xxxxxxxxxx>
Date: Tue, 29 May 2012 16:58:35 -0400
Subject: [PATCH 53/90] FIXME NO IDEA!!!
---
libsepol/src/expand.c | 58 +++++++++++++++----------------------------------
1 file changed, 18 insertions(+), 40 deletions(-)
diff --git a/libsepol/src/expand.c b/libsepol/src/expand.c
index 73b9107..0c05465 100644
--- a/libsepol/src/expand.c
+++ b/libsepol/src/expand.c
@@ -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;
- }
}
}
}
--
1.7.10.2
