aboutsummaryrefslogtreecommitdiff
path: root/swaygrab
diff options
context:
space:
mode:
authorBjörn Esser <besser82@fedoraproject.org>2017-12-14 17:14:47 +0100
committerBjörn Esser <besser82@fedoraproject.org>2017-12-14 18:47:24 +0100
commit02da9c4e7cafb36083566e511cc7913d8922aaa6 (patch)
treec7993993d3f0536512a0ddfb811f44d7cc7479fe /swaygrab
parent8272a9bae0d288b479c517dde3e831ea3889dc7f (diff)
Adaptions for API change in json-c v0.13
Diffstat (limited to 'swaygrab')
-rw-r--r--swaygrab/json.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/swaygrab/json.c b/swaygrab/json.c
index 286085c3..f0e8fa90 100644
--- a/swaygrab/json.c
+++ b/swaygrab/json.c
@@ -50,8 +50,7 @@ static json_object *get_focused_container_r(json_object *c) {
} else {
json_object *nodes, *node, *child;
json_object_object_get_ex(c, "nodes", &nodes);
- int i;
- for (i = 0; i < json_object_array_length(nodes); i++) {
+ for (json_ar_len_t i = 0; i < json_object_array_length(nodes); i++) {
node = json_object_array_get_idx(nodes, i);
if ((child = get_focused_container_r(node))) {
@@ -60,7 +59,7 @@ static json_object *get_focused_container_r(json_object *c) {
}
json_object_object_get_ex(c, "floating_nodes", &nodes);
- for (i = 0; i < json_object_array_length(nodes); i++) {
+ for (json_ar_len_t i = 0; i < json_object_array_length(nodes); i++) {
node = json_object_array_get_idx(nodes, i);
if ((child = get_focused_container_r(node))) {
@@ -83,7 +82,7 @@ char *get_focused_output() {
if (!outputs) {
sway_abort("Unabled to get focused output. No nodes in tree.");
}
- for (int i = 0; i < json_object_array_length(outputs); i++) {
+ for (json_ar_len_t i = 0; i < json_object_array_length(outputs); i++) {
output = json_object_array_get_idx(outputs, i);
if (get_focused_container_r(output)) {
@@ -131,7 +130,7 @@ json_object *get_output_container(const char *output) {
json_object *outputs, *json_output, *name;
json_object_object_get_ex(tree, "nodes", &outputs);
- for (int i = 0; i < json_object_array_length(outputs); i++) {
+ for (json_ar_len_t i = 0; i < json_object_array_length(outputs); i++) {
json_output = json_object_array_get_idx(outputs, i);
json_object_object_get_ex(json_output, "name", &name);