Bug fix for printing ...

[satune.git] / src / common.h

diff --git a/src/common.h b/src/common.h
index 3fffb3419b88f3dc516c48ea915af6f7cb13167c..3a0eeaa01c4dd3a0ad0c8e9f7416968ef323f968 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -18,20 +18,21 @@
 #include "config.h"
 #include "time.h"
 
-/*
-   extern int model_out;
-   extern int model_err;
-   extern int switch_alloc;
 
- #define model_dprintf(fd, fmt, ...) do { switch_alloc = 1; dprintf(fd, fmt, ## __VA_ARGS__); switch_alloc = 0; } while (0)
+#if 0
+extern int model_out;
+extern int model_err;
+extern int switch_alloc;
 
- #define model_print(fmt, ...) do { model_dprintf(model_out, fmt, ## __VA_ARGS__); } while (0)
+#define model_dprintf(fd, fmt, ...) do { int oldsw = switch_alloc; switch_alloc = 1; dprintf(fd, fmt, ## __VA_ARGS__); switch_alloc = oldsw; } while (0)
 
- #define model_print_err(fmt, ...) do { model_dprintf(model_err, fmt, ## __VA_ARGS__); } while (0)
+#define model_print(fmt, ...) do { model_dprintf(model_out, fmt, ## __VA_ARGS__); } while (0)
+#define model_print_err(fmt, ...) do { model_dprintf(model_err, fmt, ## __VA_ARGS__); } while (0)
+#else
+#define model_print printf
+#endif
 
- */
 
-#define model_print printf
 
 #define NEXTPOW2(x) ((x == 1) ? 1 : (1 << (sizeof(uint) * 8 - __builtin_clz(x - 1))))
 #define NUMBITS(x) ((x == 0) ? 0 : 8 * sizeof(x) - __builtin_clz(x))
@@ -54,9 +55,9 @@ void assert_hook(void);
                if (!(expr)) { \
                        fprintf(stderr, "Error: assertion failed in %s at line %d\n", __FILE__, __LINE__); \
                        /* print_trace(); // Trace printing may cause dynamic memory allocation */ \
-                       assert_hook();                           \
-                       exit(EXIT_FAILURE); \
-               } \
+                       assert_hook();                                                                                                   \
+                       exit(EXIT_FAILURE);     \
+               }       \
        } while (0)
 #else
 #define ASSERT(expr) \
@@ -69,7 +70,7 @@ void print_trace(void);
 
 static inline long long getTimeNano() {
        struct timespec time;
-       clock_gettime(CLOCK_REALTIME, & time);
+       clock_gettime(CLOCK_REALTIME, &time);
        return time.tv_sec * 1000000000 + time.tv_nsec;
 }
 #endif/* __COMMON_H__ */