X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=logging.h;h=40c342c3ab0c04c7b2690c1e34548f06c49ee0ee;hb=16ddbbe10a6484daf63596818a19890225388a71;hp=df5922b3e666e0af7a483685f895cfdb80a5b000;hpb=267f534d1c809c31e0dcc9613953ecac45529038;p=elogind.git

diff --git a/logging.h b/logging.h
index df5922b3e..40c342c3a 100644
--- 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,21 +27,26 @@
 #define info(format, arg...)		do { } while (0)
 #define dbg(format, arg...)		do { } while (0)
 #define dbg_parse(format, arg...)	do { } while (0)
+#define init_logging(foo)		do { } while (0)
 
 #ifdef LOG
+#include <stdarg.h>
+#include <unistd.h>
 #include <syslog.h>
 
+#define LOGNAME_SIZE			42
+
 #undef info
 #define info(format, arg...)								\
 	do {										\
-		log_message (LOG_INFO , format , ## arg);				\
+		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);	\
+		log_message(LOG_DEBUG , "%s: " format , __FUNCTION__ , ## arg);	\
 	} while (0)
 #endif
 
@@ -50,13 +55,23 @@
 #undef dbg_parse
 #define dbg_parse(format, arg...)							\
 	do {										\
-		log_message (LOG_DEBUG , "%s: " format , __FUNCTION__ , ## arg);	\
+		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)));
 
+/* each program that uses syslog must declare this variable somewhere */
+extern unsigned char logname[LOGNAME_SIZE];
+
+#undef init_logging
+static inline void init_logging(char *program_name)
+{
+	snprintf(logname, LOGNAME_SIZE,"%s[%d]", program_name, getpid());
+	openlog(logname, 0, LOG_DAEMON);
+}
+
+#endif	/* LOG */
+
 #endif