Merge branch 'master' into next

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

diff --git a/i3bar/src/main.c b/i3bar/src/main.c
index c62f7b3c96d74c8a1d0a802caf4ac9aeb455fcd5..ee3d81b974e23923ec2dcacfa2dce47b28708887 100644 (file)
--- a/i3bar/src/main.c
+++ b/i3bar/src/main.c
@@ -18,7 +18,7 @@
 #include "common.h"
 
 /*
- * Having verboselog() and errorlog() is necessary when using libi3.
+ * Having verboselog(), errorlog() and debuglog() is necessary when using libi3.
  *
  */
 void verboselog(char *fmt, ...) {
@@ -37,6 +37,9 @@ void errorlog(char *fmt, ...) {
     va_end(args);
 }
 
+void debuglog(char *fmt, ...) {
+}
+
 /*
  * Glob path, i.e. expand ~
  *
@@ -96,12 +99,11 @@ int main(int argc, char **argv) {
     memset(&config, '\0', sizeof(config_t));
 
     static struct option long_opt[] = {
-        { "socket",               required_argument, 0, 's' },
-        { "bar_id",               required_argument, 0, 'b' },
-        { "help",                 no_argument,       0, 'h' },
-        { "version",              no_argument,       0, 'v' },
-        { NULL,                   0,                 0, 0}
-    };
+        {"socket", required_argument, 0, 's'},
+        {"bar_id", required_argument, 0, 'b'},
+        {"help", no_argument, 0, 'h'},
+        {"version", no_argument, 0, 'v'},
+        {NULL, 0, 0, 0}};
 
     while ((opt = getopt_long(argc, argv, "b:s:hv", long_opt, &option_index)) != -1) {
         switch (opt) {
@@ -109,7 +111,7 @@ int main(int argc, char **argv) {
                 socket_path = expand_path(optarg);
                 break;
             case 'v':
-                printf("i3bar version " I3_VERSION " © 2010-2011 Axel Wagner and contributors\n");
+                printf("i3bar version " I3_VERSION " © 2010-2014 Axel Wagner and contributors\n");
                 exit(EXIT_SUCCESS);
                 break;
             case 'b':
@@ -169,8 +171,6 @@ int main(int argc, char **argv) {
 
     kill_child();
 
-    FREE(statusline_buffer);
-
     clean_xcb();
     ev_default_destroy();