more gettextization

2 files changed, 45 insertions, 20 deletions

diff --git a/include/wolf/log.h b/include/wolf/log.h
index 42e3cd0..4603be3 100644
--- a/include/wolf/log.h
+++ b/include/wolf/log.h
@@ -279,9 +279,6 @@ void wolf_log_reopenlogtoeventlog( void );
  */
 void wolf_log( wolf_log_level_t level, int category_id, int message_id, const char *format, ... );
 
-#define WOLF_LOG( level, format, ... ) \
-   wolf_log( level, -1, -1, format, ## __VA_ARGS__ )
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/include/wolf/messages.h b/include/wolf/messages.h
index d25c553..6042195 100644
--- a/include/wolf/messages.h
+++ b/include/wolf/messages.h
@@ -31,6 +31,9 @@
 
 /* IMPORTANT: Think ones and define the constants here. They should
  *            NEVER be changed anymore!
+ * IMPORTANT: Mark deprecated messages and categories, but don't
+ *            delete them! Maybe after a major release cycle they
+ *            can drop out..
  */
 
 /*
@@ -45,30 +48,55 @@
  * resources in the DLL).
  */
 
-#define WOLF_CATEGORY_LOGGER			1
-#define WOLF_CATEGORY_DAEMON			2
+#define WOLF_CATEGORY_LOGGER					1
+#define WOLF_CATEGORY_DAEMON					2
+
+/**
+ * Last internally used category. Applications should define their
+ * own categories starting from WOLF_LAST_INTERNAL_CATEGORY+1.
+ */
+#define WOLF_LAST_INTERNAL_CATEGORY				2
 
 /*
  * MESSAGES of category LOGGER
  */
 
-#define WOLF_MSG_LOGGER_BASE				WOLF_CATEGORY_LOGGER * 1000
-#define WOLF_MSG_LOGGER_UNABLE_TO_OPEN_LOGFILE		WOLF_MSG_LOGGER_BASE+1
+#define WOLF_MSG_LOGGER_BASE					WOLF_CATEGORY_LOGGER * 1000
+#define WOLF_MSG_LOGGER_UNABLE_TO_OPEN_LOGFILE			WOLF_MSG_LOGGER_BASE+1
 
-/**
- * Last internally used category. Applications should define their
- * own categories starting from WOLF_LAST_INTERNAL_CATEGORY+1.
+/*
+ * MESSAGES of category DAEMON
  */
-#define WOLF_LAST_INTERNAL_CATEGORY 2
-
-#define WOLF_MSG_DAEMON_BASE				WOLF_CATEGORY_DAEMON * 1000
-#define WOLF_MSG_DAEMON_CANT_INSTALL_IGNORE_SIGNAL	WOLF_MSG_DAEMON_BASE+1
-#define WOLF_MSG_DAEMON_IGNORE_SIGNAL			WOLF_MSG_DAEMON_BASE+2
-#define WOLF_MSG_DAEMON_CANT_INSTALL_CRITICAL_SIGNAL	WOLF_MSG_DAEMON_BASE+3
-#define WOLF_MSG_DAEMON_CRITICAL_SIGNAL			WOLF_MSG_DAEMON_BASE+4
-#define WOLF_MSG_DAEMON_GOT_SIGNAL			WOLF_MSG_DAEMON_BASE+5
-#define WOLF_MSG_DAEMON_CANT_INSTALL_FUNC_SIGNAL	WOLF_MSG_DAEMON_BASE+6
-#define WOLF_MSG_DAEMON_FUNC_SIGNAL			WOLF_MSG_DAEMON_BASE+7
+
+#define WOLF_MSG_DAEMON_BASE					WOLF_CATEGORY_DAEMON * 1000
+#define WOLF_MSG_DAEMON_CANT_INSTALL_IGNORE_SIGNAL		WOLF_MSG_DAEMON_BASE+1
+#define WOLF_MSG_DAEMON_IGNORE_SIGNAL				WOLF_MSG_DAEMON_BASE+2
+#define WOLF_MSG_DAEMON_CANT_INSTALL_CRITICAL_SIGNAL		WOLF_MSG_DAEMON_BASE+3
+#define WOLF_MSG_DAEMON_CRITICAL_SIGNAL				WOLF_MSG_DAEMON_BASE+4
+#define WOLF_MSG_DAEMON_GOT_SIGNAL				WOLF_MSG_DAEMON_BASE+5
+#define WOLF_MSG_DAEMON_CANT_INSTALL_FUNC_SIGNAL		WOLF_MSG_DAEMON_BASE+6
+#define WOLF_MSG_DAEMON_FUNC_SIGNAL				WOLF_MSG_DAEMON_BASE+7
+#define WOLF_MSG_DAEMON_NO_PIDFILE				WOLF_MSG_DAEMON_BASE+8
+#define WOLF_MSG_DAEMON_CANT_OPEN_PIDFILE			WOLF_MSG_DAEMON_BASE+9
+#define WOLF_MSG_DAEMON_ANOTHER_IS_RUNNING			WOLF_MSG_DAEMON_BASE+10
+#define WOLF_MSG_DAEMON_CANT_LOCK_PIDFILE			WOLF_MSG_DAEMON_BASE+11
+#define WOLF_MSG_DAEMON_CANT_READ_PID_FROM_PIDFILE		WOLF_MSG_DAEMON_BASE+12
+#define WOLF_MSG_DAEMON_PIDFILE_WITH_ILLEGAL_DATA		WOLF_MSG_DAEMON_BASE+13
+#define WOLF_MSG_DAEMON_FOUND_PID_IN_PIDFILE			WOLF_MSG_DAEMON_BASE+14
+#define WOLF_MSG_DAEMON_FOUND_PID_BUT_NO_PROCESS_RUNNING	WOLF_MSG_DAEMON_BASE+15
+#define WOLF_MSG_DAEMON_PROCESS_ALIVE_CHECK_FAILED		WOLF_MSG_DAEMON_BASE+16
+#define WOLF_MSG_DAEMON_ALREADY_RUNNING				WOLF_MSG_DAEMON_BASE+17
+#define WOLF_MSG_DAEMON_PIDFILE_IN_USE				WOLF_MSG_DAEMON_BASE+18
+#define WOLF_MSG_DAEMON_CANT_LOCK_PIDFILE_AFTER_CREATION	WOLF_MSG_DAEMON_BASE+19
+#define WOLF_MSG_DAEMON_CANT_TRUNCATE_PIDFILE			WOLF_MSG_DAEMON_BASE+20
+#define WOLF_MSG_DAEMON_CANT_WRITE_PID_INTO_PIDFILE		WOLF_MSG_DAEMON_BASE+21
+#define WOLF_MSG_DAEMON_ATOMIC_PIDFILE_WRITE_FAILED		WOLF_MSG_DAEMON_BASE+22
+#define WOLF_MSG_DAEMON_STORED_PIDFILE				WOLF_MSG_DAEMON_BASE+23
+#define WOLF_MSG_DAEMON_RELEASING_PIDFILE			WOLF_MSG_DAEMON_BASE+24
+#define WOLF_MSG_DAEMON_CANT_UNLOCK_PIDFILE			WOLF_MSG_DAEMON_BASE+25
+#define WOLF_MSG_DAEMON_CANT_CLOSE_PIDFILE			WOLF_MSG_DAEMON_BASE+26
+#define WOLF_MSG_DAEMON_REMOVING_PIDFILE			WOLF_MSG_DAEMON_BASE+27
+#define WOLF_MSG_DAEMON_CANT_REMOVE_PIDFILE			WOLF_MSG_DAEMON_BASE+28
 
 #ifdef __cplusplus
 extern "C" {