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

diff --git a/logging.h b/logging.h
index df5922b3e..2ba2ac496 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,8 +27,11 @@
 #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>
 
 #undef info
@@ -54,9 +57,19 @@
 	} 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[42];
+
+#undef init_logging
+static inline void init_logging(char *program_name)
+{
+	snprintf(logname, 42,"%s[%d]", program_name, getpid());
+	openlog(logname, 0, LOG_DAEMON);
+}
+
+#endif	/* LOG */
+
 #endif