--- a/src/log.h	Sun Mar 01 01:48:14 2009 +0200
+++ b/src/log.h	Sun Mar 01 02:02:48 2009 +0200
@@ -38,14 +38,14 @@
 /**
  * Log a message with LOG_ERROR, appending the formatted error code
  */
-void _log_err (err_t err, const char *func, const char *format, ...)
-    __attribute__ ((format (printf, 3, 4)));
+void _log_err (enum log_level level, err_t err, const char *func, const char *format, ...)
+    __attribute__ ((format (printf, 4, 5)));
 
-void _log_err_info (struct error_info *err, const char *func, const char *format, ...)
-    __attribute__ ((format (printf, 3, 4)));
+void _log_err_info (enum log_level level, struct error_info *err, const char *func, const char *format, ...)
+    __attribute__ ((format (printf, 4, 5)));
 
-#define log_err(err, ...) _log_err(err, __func__, __VA_ARGS__)
-#define log_err_info(err_info, ...) _log_err_info(err_info, __func__, __VA_ARGS__)
+#define log_err(err, ...) _log_err(LOG_ERROR, err, __func__, __VA_ARGS__)
+#define log_err_info(err_info, ...) _log_err_info(LOG_ERROR, err_info, __func__, __VA_ARGS__)
 
 /*
  * log_fatal + exit failure
@@ -53,8 +53,13 @@
 #define FATAL(...) do { log_fatal(__VA_ARGS__); exit(EXIT_FAILURE); } while (0)
 
 /*
+ * log_err + exit failure
+ */
+#define FATAL_ERR(err_code, ...) do { _log_err(LOG_FATAL, err_code, __func__, __VA_ARGS__); exit(EXIT_FAILURE); } while (0)
+
+/*
  * log_err_info + exit failure
  */
-#define FATAL_ERROR(err, ...) do { log_err_info(err, __VA_ARGS__); exit(EXIT_FAILURE); } while (0)
+#define FATAL_ERROR(err_info, ...) do { _log_err_info(LOG_FATAL, err_info, __func__, __VA_ARGS__); exit(EXIT_FAILURE); } while (0)
 
 #endif /* LOG_H */