Merge branch 'next'

[i3/i3] / src / output.c

diff --git a/src/output.c b/src/output.c
index 684879240bad55366a261bdc231384d42ab0c059..1a1a5c460af0b5c6d1d9e01040785eeaa6434454 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -1,7 +1,14 @@
+#undef I3__FILE__
+#define I3__FILE__ "output.c"
 /*
  * vim:ts=4:sw=4:expandtab
+ *
+ * i3 - an improved dynamic tiling window manager
+ * © 2009-2013 Michael Stapelberg and contributors (see also: LICENSE)
+ *
+ * output.c: Output (monitor) related functions.
+ *
  */
-
 #include "all.h"
 
 /*
@@ -15,6 +22,5 @@ Con *output_get_content(Con *output) {
         if (child->type == CT_CON)
             return child;
 
-    ELOG("output_get_content() called on non-output %p\n", output);
-    assert(false);
+    return NULL;
 }