Bugfix: make sure $else works correct and without memleaks

[monky] / src / logging.h

diff --git a/src/logging.h b/src/logging.h
index 0f5bb42..8916ff9 100644 (file)
--- a/src/logging.h
+++ b/src/logging.h
@@ -1,4 +1,6 @@
-/* Conky, a system monitor, based on torsmo
+/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*-
+ *
+ * Conky, a system monitor, based on torsmo
  *
  * Any original torsmo code is licensed under the BSD license
  *
@@ -25,20 +27,20 @@
  *
  */
 
-void clean_up(void);
+void clean_up(void *memtofree1, void* memtofree2);
 
 #ifndef _LOGGING_H
 #define _LOGGING_H
 
-#define ERR(...) { \
+#define NORM_ERR(...) { \
        fprintf(stderr, PACKAGE_NAME": "); \
        fprintf(stderr, __VA_ARGS__); \
        fprintf(stderr, "\n"); \
 }
 
 /* critical error */
-#define CRIT_ERR(...) \
-       { ERR(__VA_ARGS__); clean_up(); exit(EXIT_FAILURE); }
+#define CRIT_ERR(memtofree1, memtofree2, ...) \
+       { NORM_ERR(__VA_ARGS__); clean_up(memtofree1, memtofree2); exit(EXIT_FAILURE); }
 
 /* debugging output */
 extern int global_debug_level;