udevd: fix udevd read() calls to leave room for null byte

[elogind.git] / logging.h

diff --git a/logging.h b/logging.h
index 1f2126839bf323faedfaf45f32fe0cc3a8253e63..e0dcb80305ecb08e081200801451b9f93096bdf2 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
@@ -24,37 +24,52 @@
 #ifndef LOGGING_H
 #define LOGGING_H
 
-#ifdef LOG
+#define err(format, arg...)            do { } while (0)
+#define info(format, arg...)           do { } while (0)
+#define dbg(format, arg...)            do { } while (0)
+#define logging_init(foo)              do { } while (0)
+#define logging_close(foo)             do { } while (0)
+
+#ifdef USE_LOG
+#include <stdarg.h>
+#include <unistd.h>
 #include <syslog.h>
-#define info(format, arg...)                                                           \
-       do {                                                                            \
-               log_message (LOG_INFO , format , ## arg);       \
+
+#undef err
+#define err(format, arg...)                                                    \
+       do {                                                                    \
+               log_message(LOG_ERR ,"%s: " format ,__FUNCTION__ ,## arg);              \
        } while (0)
-#else
-       #define info(format, arg...) do { } while (0)
-#endif
 
-#ifdef DEBUG
-#define dbg(format, arg...)                                                            \
-       do {                                                                            \
-               log_message (LOG_DEBUG , "%s: " format , __FUNCTION__ , ## arg);        \
+#undef info
+#define info(format, arg...)                                                   \
+       do {                                                                    \
+               log_message(LOG_INFO ,"%s: " format ,__FUNCTION__ ,## arg);             \
        } while (0)
-#else
-       #define dbg(format, arg...) do { } while (0)
-#endif
 
-/* Parser needs it's own debugging statement, we usually don't care about this at all */
-#ifdef DEBUG_PARSER
-#define dbg_parse(format, arg...)                                                      \
-       do {                                                                            \
-               log_message (LOG_DEBUG , "%s: " format , __FUNCTION__ , ## arg);        \
+#ifdef DEBUG
+#undef dbg
+#define dbg(format, arg...)                                                    \
+       do {                                                                    \
+               log_message(LOG_DEBUG ,"%s: " format ,__FUNCTION__ ,## arg);    \
        } while (0)
-#else
-       #define dbg_parse(format, arg...) do { } while (0)
 #endif
 
-
-extern int log_message (int level, const char *format, ...)
+extern void log_message(int priority, 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