Merge branch 'master' into next

[i3/i3] / include / log.h

diff --git a/include/log.h b/include/log.h
index 6d529a00f27133b524e3c9a6171898634b027c2c..0eb5574444c06fc8b30356721fd9a44ad3fbeb96 100644 (file)
--- a/include/log.h
+++ b/include/log.h
@@ -1,11 +1,10 @@
 /*
- * vim:ts=8:expandtab
+ * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
+ * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
  *
- * © 2009-2010 Michael Stapelberg and contributors
- *
- * See file LICENSE for license information.
+ * log.c: Setting of loglevels, logging functions.
  *
  */
 #ifndef _LOG_H
@@ -21,6 +20,16 @@
 #define DLOG(fmt, ...) debuglog(LOGLEVEL, "%s:%s:%d - " fmt, __FILE__, __FUNCTION__, __LINE__, ##__VA_ARGS__)
 
 extern char *loglevels[];
+extern char *errorfilename;
+extern char *shmlogname;
+extern int shmlog_size;
+
+/**
+ * Initializes logging by creating an error logfile in /tmp (or
+ * XDG_RUNTIME_DIR, see get_process_filename()).
+ *
+ */
+void init_logging();
 
 /**
  * Enables the given loglevel.
@@ -41,7 +50,7 @@ void set_verbosity(bool _verbose);
  * but only if the corresponding debug loglevel was activated.
  *
  */
-void debuglog(int lev, char *fmt, ...);
+void debuglog(uint64_t lev, char *fmt, ...);
 
 /**
  * Logs the given message to stdout while prefixing the current time to it.