Merge branch 'master' into next

[i3/i3] / include / log.h

diff --git a/include/log.h b/include/log.h
index d3e967e77e2a206a065ddd9cf307b6ec3da811cb..c9d1d0cd67a15e4f7652fb7128b327022e7fc543 100644 (file)
--- a/include/log.h
+++ b/include/log.h
@@ -7,17 +7,25 @@
  * log.c: Logging functions.
  *
  */
-#ifndef _LOG_H
-#define _LOG_H
+#ifndef I3_LOG_H
+#define I3_LOG_H
 
 #include <stdarg.h>
 #include <stdbool.h>
 
+/* We will include libi3.h which define its own version of LOG, ELOG.
+ * We want *our* version, so we undef the libi3 one. */
+#if defined(LOG)
+#undef LOG
+#endif
+#if defined(ELOG)
+#undef ELOG
+#endif
 /** ##__VA_ARGS__ means: leave out __VA_ARGS__ completely if it is empty, that
    is, delete the preceding comma */
 #define LOG(fmt, ...) verboselog(fmt, ##__VA_ARGS__)
 #define ELOG(fmt, ...) errorlog("ERROR: " fmt, ##__VA_ARGS__)
-#define DLOG(fmt, ...) debuglog("%s:%s:%d - " fmt, __FILE__, __FUNCTION__, __LINE__, ##__VA_ARGS__)
+#define DLOG(fmt, ...) debuglog("%s:%s:%d - " fmt, I3__FILE__, __FUNCTION__, __LINE__, ##__VA_ARGS__)
 
 extern char *errorfilename;
 extern char *shmlogname;
@@ -30,6 +38,18 @@ extern int shmlog_size;
  */
 void init_logging(void);
 
+/**
+ * Opens the logbuffer.
+ *
+ */
+void open_logbuffer(void);
+
+/**
+ * Closes the logbuffer.
+ *
+ */
+void close_logbuffer(void);
+
 /**
  * Set debug logging.
  *
@@ -68,10 +88,10 @@ void verboselog(char *fmt, ...)
     __attribute__ ((format (printf, 1, 2)));
 
 /**
- * Logs the given message to stdout while prefixing the current time to it.
- * This is to be called by LOG() which includes filename/linenumber
- *
+ * Deletes the unused log files. Useful if i3 exits immediately, eg.
+ * because --get-socketpath was called. We don't care for syscall
+ * failures. This function is invoked automatically when exiting.
  */
-void slog(char *fmt, va_list args);
+void purge_zerobyte_logfile(void);
 
 #endif