format **/*.c with clang-format-3.5

[i3/i3] / i3-dump-log / main.c

diff --git a/i3-dump-log/main.c b/i3-dump-log/main.c
index 852a5cf7b2fc944e50272fcd2c1a9b676c2070f6..86b39338eae682f927bf93236658719bb03899cc 100644 (file)
--- a/i3-dump-log/main.c
+++ b/i3-dump-log/main.c
@@ -29,11 +29,11 @@
 #include <i3/ipc.h>
 
 static uint32_t offset_next_write,
-                wrap_count;
+    wrap_count;
 
 static i3_shmlog_header *header;
 static char *logbuffer,
-            *walk;
+    *walk;
 
 static int check_for_wrap(void) {
     if (wrap_count == header->wrap_count)
@@ -70,8 +70,7 @@ int main(int argc, char *argv[]) {
         {"verbose", no_argument, 0, 'V'},
         {"follow", no_argument, 0, 'f'},
         {"help", no_argument, 0, 'h'},
-        {0, 0, 0, 0}
-    };
+        {0, 0, 0, 0}};
 
     char *options_string = "s:vfVh";
 
@@ -90,7 +89,7 @@ int main(int argc, char *argv[]) {
         }
     }
 
-    char *shmname = root_atom_contents("I3_SHMLOG_PATH");
+    char *shmname = root_atom_contents("I3_SHMLOG_PATH", NULL, 0);
     if (shmname == NULL) {
         /* Something failed. Let’s invest a little effort to find out what it
          * is. This is hugely helpful for users who want to debug i3 but are
@@ -109,7 +108,7 @@ int main(int argc, char *argv[]) {
             fprintf(stderr, "FYI: The DISPLAY environment variable is set to \"%s\".\n", getenv("DISPLAY"));
             exit(1);
         }
-        if (root_atom_contents("I3_CONFIG_PATH") != NULL) {
+        if (root_atom_contents("I3_CONFIG_PATH", conn, screen) != NULL) {
             fprintf(stderr, "i3-dump-log: ERROR: i3 is running, but SHM logging is not enabled.\n\n");
             if (!is_debug_build()) {
                 fprintf(stderr, "You seem to be using a release version of i3:\n  %s\n\n", I3_VERSION);
@@ -139,7 +138,7 @@ int main(int argc, char *argv[]) {
     if (logbuffer == MAP_FAILED)
         err(EXIT_FAILURE, "Could not mmap SHM segment for the i3 log");
 
-    header = (i3_shmlog_header*)logbuffer;
+    header = (i3_shmlog_header *)logbuffer;
 
     if (verbose)
         printf("next_write = %d, last_wrap = %d, logbuffer_size = %d, shmname = %s\n",