[PATCH] The following patch fixes some warnings when compiling volume_id

[elogind.git] / logging.h

diff --git a/logging.h b/logging.h
index 2d09b9a088c115452899770bcab525eb01bff598..3ff54ec9747648f36f8ee2412ed39532fc62b6d4 100644 (file)
--- a/logging.h
+++ b/logging.h
@@ -1,9 +1,9 @@
 /*
  * logging.h
  *
- * Userspace devfs
+ * Simple logging functions that can be compiled away into nothing.
  *
- * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
+ * Copyright (C) 2003,2004 Greg Kroah-Hartman <greg@kroah.com>
  * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
  *
  *     This program is free software; you can redistribute it and/or modify it
@@ -27,36 +27,52 @@
 #define info(format, arg...)           do { } while (0)
 #define dbg(format, arg...)            do { } while (0)
 #define dbg_parse(format, arg...)      do { } while (0)
+#define logging_init(foo)              do { } while (0)
+#define logging_close(foo)             do { } while (0)
 
-#ifdef LOG
+#ifdef USE_LOG
+#include <stdarg.h>
+#include <unistd.h>
 #include <syslog.h>
 
 #undef info
-#define info(format, arg...)                                                           \
-       do {                                                                            \
-               log_message (LOG_INFO , format , ## arg);       \
+#define info(format, arg...)                                                   \
+       do {                                                                    \
+               log_message(LOG_INFO , format , ## arg);                        \
        } while (0)
 
 #ifdef DEBUG
 #undef dbg
-#define dbg(format, arg...)                                                            \
-       do {                                                                            \
-               log_message (LOG_DEBUG , "%s: " format , __FUNCTION__ , ## arg);        \
+#define dbg(format, arg...)                                                    \
+       do {                                                                    \
+               log_message(LOG_DEBUG , "%s: " format , __FUNCTION__ , ## arg); \
        } while (0)
 #endif
 
 /* Parser needs it's own debugging statement, we usually don't care about this at all */
 #ifdef DEBUG_PARSER
 #undef dbg_parse
-#define dbg_parse(format, arg...)                                                      \
-       do {                                                                            \
-               log_message (LOG_DEBUG , "%s: " format , __FUNCTION__ , ## arg);        \
+#define dbg_parse(format, arg...)                                              \
+       do {                                                                    \
+               log_message(LOG_DEBUG , "%s: " format , __FUNCTION__ , ## arg); \
        } while (0)
 #endif
 
-#endif /* LOG */
-
-extern int log_message (int level, const char *format, ...)
+extern void log_message(int level, const char *format, ...)
        __attribute__ ((format (printf, 2, 3)));
 
+#undef logging_init
+static inline void logging_init(const char *program_name)
+{
+       openlog(program_name, LOG_PID, LOG_DAEMON);
+}
+
+#undef logging_close
+static inline void logging_close(void)
+{
+       closelog();
+}
+
+#endif /* USE_LOG */
+
 #endif