From b947ad96f990d0ad39cdd8beecaec3cebaffb6d7 Mon Sep 17 00:00:00 2001 From: Mike Salvatore Date: Sat, 5 Sep 2020 09:38:53 -0400 Subject: [PATCH] parser: convert commented out fprintf() in immunix.h to PDEBUG() --- parser/immunix.h | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/parser/immunix.h b/parser/immunix.h index 8feb75809..9039817b9 100644 --- a/parser/immunix.h +++ b/parser/immunix.h @@ -145,18 +145,31 @@ enum pattern_t { #define HAS_CHANGE_PROFILE(mode) ((mode) & AA_CHANGE_PROFILE) #include +#include + +#ifdef DEBUG +#define PDEBUG(fmt, args...) \ +do { \ + int pdebug_error = errno; \ + fprintf(stderr, "parser: " fmt, ## args); \ + errno = pdebug_error; \ +} while (0) +#else +#define PDEBUG(fmt, args...) /* Do nothing */ +#endif + static inline int is_merged_x_consistent(int a, int b) { if ((a & AA_USER_EXEC) && (b & AA_USER_EXEC) && ((a & AA_USER_EXEC_TYPE) != (b & AA_USER_EXEC_TYPE))) { - //fprintf(stderr, "failed user merge 0x%x 0x%x\n", a, b); + PDEBUG("failed user merge 0x%x 0x%x\n", a, b); return 0; } if ((a & AA_OTHER_EXEC) && (b & AA_OTHER_EXEC) && ((a & AA_OTHER_EXEC_TYPE) != (b & AA_OTHER_EXEC_TYPE))) { - //fprintf(stderr, "failed other merge 0x%x 0x%x\n", a, b); + PDEBUG("failed other merge 0x%x 0x%x\n", a, b); return 0; } return 1;