X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=common.h;h=62c16f45250e55a693864fd17759b9673d0220d6;hb=26010e1410faa0dcefc8d384872bc0210cc0be92;hp=c861285a8ab12c3c73720e357679ec84d4bc8269;hpb=9d9c0f4e9909c2f58889e198a065479003f7bced;p=model-checker.git diff --git a/common.h b/common.h index c861285..62c16f4 100644 --- a/common.h +++ b/common.h @@ -8,9 +8,9 @@ #include #include "config.h" -extern FILE *model_out; +extern int model_out; -#define model_print(fmt, ...) do { fprintf(model_out, fmt, ##__VA_ARGS__); } while (0) +#define model_print(fmt, ...) do { dprintf(model_out, fmt, ##__VA_ARGS__); } while (0) #ifdef CONFIG_DEBUG #define DEBUG(fmt, ...) do { model_print("*** %15s:%-4d %25s() *** " fmt, __FILE__, __LINE__, __func__, ##__VA_ARGS__); } while (0) @@ -29,8 +29,7 @@ void assert_hook(void); do { \ if (!(expr)) { \ fprintf(stderr, "Error: assertion failed in %s at line %d\n", __FILE__, __LINE__); \ - print_trace(); \ - model_print_summary(); \ + /* print_trace(); // Trace printing may cause dynamic memory allocation */ \ assert_hook(); \ exit(EXIT_FAILURE); \ } \ @@ -43,5 +42,4 @@ do { \ #define error_msg(...) fprintf(stderr, "Error: " __VA_ARGS__) void print_trace(void); -void model_print_summary(void); #endif /* __COMMON_H__ */