X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=logging.h;h=6e1d5a20ef7d7f28faade207c422686f21182bf1;hp=1f2126839bf323faedfaf45f32fe0cc3a8253e63;hb=661a0bea80d129d5df708e36dbaed745c9d8392e;hpb=0523018487a60ad817556af30632a212ad3351e0

diff --git a/logging.h b/logging.h
index 1f2126839..6e1d5a20e 100644
--- a/logging.h
+++ b/logging.h
@@ -1,10 +1,8 @@
 /*
- * logging.h
+ * simple logging functions that can be expanded into nothing
  *
- * Userspace devfs
- *
- * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
- * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2003-2004 Greg Kroah-Hartman <greg@kroah.com>
+ * Copyright (C) 2004-2006 Kay Sievers <kay.sievers@vrfy.org>
  *
  *	This program is free software; you can redistribute it and/or modify it
  *	under the terms of the GNU General Public License as published by the
@@ -17,44 +15,59 @@
  * 
  *	You should have received a copy of the GNU General Public License along
  *	with this program; if not, write to the Free Software Foundation, Inc.,
- *	675 Mass Ave, Cambridge, MA 02139, USA.
+ *	51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  */
 
 #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_CONS, LOG_DAEMON);
+}
+
+#undef logging_close
+static inline void logging_close(void)
+{
+	closelog();
+}
+
+#endif	/* USE_LOG */
+
 #endif