Merge branch 'next' into master

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

diff --git a/i3bar/src/outputs.c b/i3bar/src/outputs.c
index 02b718d3ae42418ddbcd8899f8aa312cfec5e278..b49ff53f6892bbb7ee69fb409c0b755d4dfbeb75 100644 (file)
--- a/i3bar/src/outputs.c
+++ b/i3bar/src/outputs.c
@@ -2,9 +2,9 @@
  * vim:ts=4:sw=4:expandtab
  *
  * i3bar - an xcb-based status- and ws-bar for i3
- * © 2010-2012 Axel Wagner and contributors (see also: LICENSE)
+ * © 2010 Axel Wagner and contributors (see also: LICENSE)
  *
- * outputs.c: Maintaining the output-list
+ * outputs.c: Maintaining the outputs list
  *
  */
 #include <string.h>
@@ -27,7 +27,7 @@ struct outputs_json_params {
 };
 
 /*
- * Parse a null-value (current_workspace)
+ * Parse a null value (current_workspace)
  *
  */
 static int outputs_null_cb(void *params_) {
@@ -139,7 +139,7 @@ static int outputs_string_cb(void *params_, const unsigned char *val, size_t len
 }
 
 /*
- * We hit the start of a json-map (rect or a new output)
+ * We hit the start of a JSON map (rect or a new output)
  *
  */
 static int outputs_start_map_cb(void *params_) {
@@ -221,7 +221,7 @@ static int outputs_end_map_cb(void *params_) {
 /*
  * Parse a key.
  *
- * Essentially we just save it in the parsing-state
+ * Essentially we just save it in the parsing state
  *
  */
 static int outputs_map_key_cb(void *params_, const unsigned char *keyVal, size_t keyLen) {
@@ -247,7 +247,7 @@ static yajl_callbacks outputs_callbacks = {
 };
 
 /*
- * Initiate the output-list
+ * Initiate the outputs list
  *
  */
 void init_outputs(void) {
@@ -256,7 +256,7 @@ void init_outputs(void) {
 }
 
 /*
- * Start parsing the received json-string
+ * Start parsing the received JSON string
  *
  */
 void parse_outputs_json(char *json) {
@@ -279,7 +279,7 @@ void parse_outputs_json(char *json) {
             break;
         case yajl_status_client_canceled:
         case yajl_status_error:
-            ELOG("Could not parse outputs-reply!\n");
+            ELOG("Could not parse outputs reply!\n");
             exit(EXIT_FAILURE);
             break;
     }