[apparmor] [PATCH] fixup! libapparmor: Move over the lib functions needed by cache loading code

Tyler Hicks tyhicks at canonical.com
Thu Mar 19 16:04:56 UTC 2015


Define MY_TEST macro in private.h

Signed-off-by: Tyler Hicks <tyhicks at canonical.com>
---
 libraries/libapparmor/src/private.h       | 6 ++++++
 libraries/libapparmor/src/tst_aalogmisc.c | 8 +-------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libraries/libapparmor/src/private.h b/libraries/libapparmor/src/private.h
index d4dc0ef..4a53bfd 100644
--- a/libraries/libapparmor/src/private.h
+++ b/libraries/libapparmor/src/private.h
@@ -35,6 +35,12 @@
 
 #endif /* ENABLE_DEBUG_OUTPUT */
 
+#define MY_TEST(statement, error)               \
+	if (!(statement)) {                     \
+		fprintf(stderr, "FAIL: %s\n", error); \
+		rc = 1; \
+	}
+
 void print_error(bool honor_env_var, const char *ident, const char *fmt, ...);
 void print_debug(const char *fmt, ...);
 
diff --git a/libraries/libapparmor/src/tst_aalogmisc.c b/libraries/libapparmor/src/tst_aalogmisc.c
index 73aceeb..b15392f 100644
--- a/libraries/libapparmor/src/tst_aalogmisc.c
+++ b/libraries/libapparmor/src/tst_aalogmisc.c
@@ -20,13 +20,7 @@
 #include <stdio.h>
 #include <aalogparse.h>
 #include "parser.h"
-
-
-#define MY_TEST(statement, error)               \
-	if (!(statement)) {                     \
-		fprintf(stderr, "FAIL: %s\n", error); \
-		rc = 1; \
-	}
+#include "private.h"
 
 int main(void)
 {
-- 
2.1.4




More information about the AppArmor mailing list