make LEPRINT* macros safe to use with if/else pairs

[pve-firewall.git] / src / pvefw-logger.c

diff --git a/src/pvefw-logger.c b/src/pvefw-logger.c
index 578d1aaebf482ecee01114c1edd4c44e79758586..19beb18406b305d8067e1a9f7d146179178e8b5e 100644 (file)
--- a/src/pvefw-logger.c
+++ b/src/pvefw-logger.c
@@ -175,8 +175,17 @@ queue_log_entry(struct log_entry *le)
 }
 
 
-#define LEPRINTF(format, ...) { if (le->len < LE_MAX) le->len += snprintf(le->buf + le->len, LE_MAX - le->len, format, ##__VA_ARGS__); }
-#define LEPRINTTIME(sec) { time_t tmp_sec = sec; if (le->len < (LE_MAX - 30)) le->len += strftime(le->buf + le->len, LE_MAX - le->len, "%d/%b/%Y:%H:%M:%S %z ", localtime(&tmp_sec)); }
+#define LEPRINTF(format, ...) \
+    do { \
+        if (le->len < LE_MAX) \
+            le->len += snprintf(le->buf + le->len, LE_MAX - le->len, format, ##__VA_ARGS__); \
+    } while (0)
+#define LEPRINTTIME(sec) \
+    do { \
+        time_t tmp_sec = sec; \
+        if (le->len < (LE_MAX - 30)) \
+            le->len += strftime(le->buf + le->len, LE_MAX - le->len, "%d/%b/%Y:%H:%M:%S %z ", localtime(&tmp_sec)); \
+    } while (0)
 
 static void
 log_status_message(guint loglevel, const char *fmt, ...)
@@ -653,8 +662,6 @@ main(int argc, char *argv[])
 
     gboolean wrote_pidfile = FALSE;
 
-    g_thread_init(NULL);
-
     openlog("pvepw-logger", LOG_CONS|LOG_PID, LOG_DAEMON);
 
     GOptionContext *context;
@@ -807,9 +814,8 @@ main(int argc, char *argv[])
     g_io_add_watch(nflog_ch, G_IO_IN, nflog_read_cb, NULL);
 
     GIOChannel *sig_ch = g_io_channel_unix_new(sigfd);
-    printf("TEST0: %p %d\n", sig_ch, sigfd);
     if (!g_io_add_watch(sig_ch, G_IO_IN, signal_read_cb, NULL)) {
-        printf("TEST1\n"); exit(-1);
+        exit(-1);
     }
 
     GThread *wthread = g_thread_new("log_writer_thread", log_writer_thread, NULL);