Commit 9133493a authored by John Johansen's avatar John Johansen
Browse files

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: default avatarJohn Johansen <john.johansen@canonical.com>
parent 21155176

security/apparmor/include/label.h

+0 −24
Original line number Diff line number Diff line
@@ -160,31 +160,7 @@ int aa_label_next_confined(struct aa_label *l, int i); 
#define label_for_each_cont(I, L, P)					\

	for (++((I).i); ((P) = (L)->vec[(I).i]); ++((I).i))



#define next_comb(I, L2)						\

do {									\

	(I).j++;							\

	if ((I).j >= (L2)->size) {					\

		(I).i++;						\

		(I).j = 0;						\

	}								\

} while (0)





/* for each combination of P1 in L1, and P2 in L2 */

#define label_for_each_comb(I, L1, L2, P1, P2)				\

for ((I).i = (I).j = 0;							\

	((P1) = (L1)->vec[(I).i]) && ((P2) = (L2)->vec[(I).j]);		\

	(I) = next_comb(I, L2))



#define fn_for_each_comb(L1, L2, P1, P2, FN)				\

({									\

	struct label_it i;						\

	int __E = 0;							\

	label_for_each_comb(i, (L1), (L2), (P1), (P2)) {		\

		last_error(__E, (FN));					\

	}								\

	__E;								\

})



/* for each profile that is enforcing confinement in a label */

#define label_for_each_confined(I, L, P)				\