logging: make libi3 use verboselog()/errorlog(), provide it in each caller

[i3/i3] / i3bar / src / main.c

diff --git a/i3bar/src/main.c b/i3bar/src/main.c
index ea84ca44d875c8af78c40b9b299873d3a21a6da5..ea6056470c5f05381fc4c1e9efffddb1e3abbb7b 100644 (file)
--- a/i3bar/src/main.c
+++ b/i3bar/src/main.c
@@ -2,10 +2,7 @@
  * vim:ts=4:sw=4:expandtab
  *
  * i3bar - an xcb-based status- and ws-bar for i3
- *
- * © 2010-2011 Axel Wagner and contributors
- *
- * See file LICNSE for license information
+ * © 2010-2012 Axel Wagner and contributors (see also: LICENSE)
  *
  */
 #include <stdio.h>
@@ -19,7 +16,26 @@
 #include <glob.h>
 
 #include "common.h"
-#include "libi3.h"
+
+/*
+ * Having verboselog() and errorlog() is necessary when using libi3.
+ *
+ */
+void verboselog(char *fmt, ...) {
+    va_list args;
+
+    va_start(args, fmt);
+    vfprintf(stdout, fmt, args);
+    va_end(args);
+}
+
+void errorlog(char *fmt, ...) {
+    va_list args;
+
+    va_start(args, fmt);
+    vfprintf(stderr, fmt, args);
+    va_end(args);
+}
 
 /*
  * Glob path, i.e. expand ~
@@ -31,11 +47,7 @@ char *expand_path(char *path) {
         ELOG("glob() failed\n");
         exit(EXIT_FAILURE);
     }
-    char *result = strdup(globbuf.gl_pathc > 0 ? globbuf.gl_pathv[0] : path);
-    if (result == NULL) {
-        ELOG("malloc() failed: %s\n", strerror(errno));
-        exit(EXIT_FAILURE);
-    }
+    char *result = sstrdup(globbuf.gl_pathc > 0 ? globbuf.gl_pathv[0] : path);
     globfree(&globbuf);
     return result;
 }
@@ -43,7 +55,7 @@ char *expand_path(char *path) {
 void print_usage(char *elf_name) {
     printf("Usage: %s [-b bar_id] [-s sock_path] [-h] [-v]\n", elf_name);
     printf("\n");
-    printf("-b <bar_id>\tBar ID for which to get the configuration\n");
+    printf("--bar_id <bar_id>\tBar ID for which to get the configuration\n");
     printf("-s <sock_path>\tConnect to i3 via <sock_path>\n");
     printf("-h\t\tDisplay this help-message and exit\n");
     printf("-v\t\tDisplay version number and exit\n");
@@ -142,14 +154,9 @@ int main(int argc, char **argv) {
     /* We listen to SIGTERM/QUIT/INT and try to exit cleanly, by stopping the main-loop.
      * We only need those watchers on the stack, so putting them on the stack saves us
      * some calls to free() */
-    ev_signal *sig_term = malloc(sizeof(ev_signal));
-    ev_signal *sig_int = malloc(sizeof(ev_signal));
-    ev_signal *sig_hup = malloc(sizeof(ev_signal));
-
-    if (sig_term == NULL || sig_int == NULL || sig_hup == NULL) {
-        ELOG("malloc() failed: %s\n", strerror(errno));
-        exit(EXIT_FAILURE);
-    }
+    ev_signal *sig_term = smalloc(sizeof(ev_signal));
+    ev_signal *sig_int = smalloc(sizeof(ev_signal));
+    ev_signal *sig_hup = smalloc(sizeof(ev_signal));
 
     ev_signal_init(sig_term, &sig_cb, SIGTERM);
     ev_signal_init(sig_int, &sig_cb, SIGINT);