Skip to content

Commit 9133493

Browse files
committed
parser: drop dead code for XXX_comb macros
The macros for label combination XXX_comb are no longer used and there are no plans to use them so remove the dead code. Signed-off-by: John Johansen <[email protected]>
1 parent 2115517 commit 9133493

File tree

1 file changed

+0
-24
lines changed

1 file changed

+0
-24
lines changed

security/apparmor/include/label.h

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -160,32 +160,8 @@ int aa_label_next_confined(struct aa_label *l, int i);
160160
#define label_for_each_cont(I, L, P) \
161161
for (++((I).i); ((P) = (L)->vec[(I).i]); ++((I).i))
162162

163-
#define next_comb(I, L2) \
164-
do { \
165-
(I).j++; \
166-
if ((I).j >= (L2)->size) { \
167-
(I).i++; \
168-
(I).j = 0; \
169-
} \
170-
} while (0)
171163

172164

173-
/* for each combination of P1 in L1, and P2 in L2 */
174-
#define label_for_each_comb(I, L1, L2, P1, P2) \
175-
for ((I).i = (I).j = 0; \
176-
((P1) = (L1)->vec[(I).i]) && ((P2) = (L2)->vec[(I).j]); \
177-
(I) = next_comb(I, L2))
178-
179-
#define fn_for_each_comb(L1, L2, P1, P2, FN) \
180-
({ \
181-
struct label_it i; \
182-
int __E = 0; \
183-
label_for_each_comb(i, (L1), (L2), (P1), (P2)) { \
184-
last_error(__E, (FN)); \
185-
} \
186-
__E; \
187-
})
188-
189165
/* for each profile that is enforcing confinement in a label */
190166
#define label_for_each_confined(I, L, P) \
191167
for ((I).i = aa_label_next_confined((L), 0); \

0 commit comments

Comments
 (0)