Merge branch 'next' into master

[i3/i3] / src / fake_outputs.c

diff --git a/src/fake_outputs.c b/src/fake_outputs.c
index acbc456d99bebe57d15f711d523ed7c43042b16f..3df0e246a28661a0d0a0d29504928442bbeff3ef 100644 (file)
--- a/src/fake_outputs.c
+++ b/src/fake_outputs.c
@@ -4,7 +4,7 @@
  * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
- * © 2009-2012 Michael Stapelberg and contributors (see also: LICENSE)
+ * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * Faking outputs is useful in pathological situations (like network X servers
  * which don’t support multi-monitor in a useful way) and for our testsuite.
@@ -21,8 +21,8 @@ static int num_screens;
 static Output *get_screen_at(unsigned int x, unsigned int y) {
     Output *output;
     TAILQ_FOREACH(output, &outputs, outputs)
-        if (output->rect.x == x && output->rect.y == y)
-            return output;
+    if (output->rect.x == x && output->rect.y == y)
+        return output;
 
     return NULL;
 }
@@ -49,7 +49,7 @@ void fake_outputs_init(const char *output_spec) {
             new_output->rect.width = min(new_output->rect.width, width);
             new_output->rect.height = min(new_output->rect.height, height);
         } else {
-            new_output = scalloc(sizeof(Output));
+            new_output = scalloc(1, sizeof(Output));
             sasprintf(&(new_output->name), "fake-%d", num_screens);
             DLOG("Created new fake output %s (%p)\n", new_output->name, new_output);
             new_output->active = true;
@@ -60,7 +60,8 @@ void fake_outputs_init(const char *output_spec) {
             /* We always treat the screen at 0x0 as the primary screen */
             if (new_output->rect.x == 0 && new_output->rect.y == 0)
                 TAILQ_INSERT_HEAD(&outputs, new_output, outputs);
-            else TAILQ_INSERT_TAIL(&outputs, new_output, outputs);
+            else
+                TAILQ_INSERT_TAIL(&outputs, new_output, outputs);
             output_init_con(new_output);
             init_ws_for_output(new_output, output_get_content(new_output->con));
             num_screens++;