chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] udev_volume_id: fix dasd disklabel reading with -l option
[elogind.git]
/
logging.h
diff --git
a/logging.h
b/logging.h
index 1f2126839bf323faedfaf45f32fe0cc3a8253e63..4f51217b9ac730d68fc3c00c4d4e5d2cc6bf1067 100644
(file)
--- a/
logging.h
+++ b/
logging.h
@@
-1,9
+1,9
@@
/*
* logging.h
*
/*
* 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
* 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,55
@@
#ifndef LOGGING_H
#define LOGGING_H
#ifndef LOGGING_H
#define LOGGING_H
+#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 LOG
+#include <stdarg.h>
+#include <unistd.h>
#include <syslog.h>
#include <syslog.h>
-#define info(format, arg...) \
- do { \
- log_message (LOG_INFO , format , ## arg); \
+
+#undef info
+#define info(format, arg...) \
+ do { \
+ log_message(LOG_INFO , format , ## arg); \
} while (0)
} while (0)
-#else
- #define info(format, arg...) do { } while (0)
-#endif
#ifdef DEBUG
#ifdef DEBUG
-#define dbg(format, arg...) \
- do { \
- log_message (LOG_DEBUG , "%s: " format , __FUNCTION__ , ## arg); \
+#undef dbg
+#define dbg(format, arg...) \
+ do { \
+ log_message(LOG_DEBUG , "%s: " format , __FUNCTION__ , ## arg); \
} while (0)
} 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
#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); \
+#undef dbg_parse
+#define dbg_parse(format, arg...) \
+ do { \
+ log_message(LOG_DEBUG , "%s: " format , __FUNCTION__ , ## arg); \
} while (0)
} while (0)
-#else
- #define dbg_parse(format, arg...) do { } while (0)
#endif
#endif
-
-extern int log_message (int level, const char *format, ...)
+extern void log_message(int level, const char *format, ...)
__attribute__ ((format (printf, 2, 3)));
__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 /* LOG */
+
#endif
#endif