aboutsummaryrefslogtreecommitdiffstats
path: root/swaymsg
diff options
context:
space:
mode:
authorLibravatar Björn Esser <besser82@fedoraproject.org>2017-12-14 01:30:54 +0100
committerLibravatar Drew DeVault <sir@cmpwn.com>2017-12-17 15:53:22 -0500
commitc08c805ecd8f2000a35cdeae7b16244d0b3c0528 (patch)
tree8a1a12a32a1d2c40bc4fdb43aa7205362438f65b /swaymsg
parentRevert "Merge remote-tracking branch 'besser82/bugfix/json-c' into 0.15" (diff)
downloadsway-c08c805ecd8f2000a35cdeae7b16244d0b3c0528.tar.gz
sway-c08c805ecd8f2000a35cdeae7b16244d0b3c0528.tar.zst
sway-c08c805ecd8f2000a35cdeae7b16244d0b3c0528.zip
Adaptions for API change in json-c v0.130.15.1
Lift restriction on json-c <= 0.12.1 ipc-server: Acquire ownership of referenced json_object properly When adding a referenced json_object with an unknown lifetime to another json_object, it must be done with a wrapped call to json_object_get() to acquire the ownership of that json_object.
Diffstat (limited to 'swaymsg')
-rw-r--r--swaymsg/main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/swaymsg/main.c b/swaymsg/main.c
index 2f9cfb14..0ee7c76f 100644
--- a/swaymsg/main.c
+++ b/swaymsg/main.c
@@ -9,7 +9,7 @@
9#include <sys/socket.h> 9#include <sys/socket.h>
10#include <ctype.h> 10#include <ctype.h>
11#include <unistd.h> 11#include <unistd.h>
12#include <json-c/json.h> 12#include "sway_json_helper.h"
13#include "stringop.h" 13#include "stringop.h"
14#include "ipc-client.h" 14#include "ipc-client.h"
15#include "readline.h" 15#include "readline.h"
@@ -149,7 +149,7 @@ static void pretty_print_version(json_object *v) {
149static void pretty_print_clipboard(json_object *v) { 149static void pretty_print_clipboard(json_object *v) {
150 if (success(v, true)) { 150 if (success(v, true)) {
151 if (json_object_is_type(v, json_type_array)) { 151 if (json_object_is_type(v, json_type_array)) {
152 for (int i = 0; i < json_object_array_length(v); ++i) { 152 for (json_ar_len_t i = 0; i < json_object_array_length(v); ++i) {
153 json_object *o = json_object_array_get_idx(v, i); 153 json_object *o = json_object_array_get_idx(v, i);
154 printf("%s\n", json_object_get_string(o)); 154 printf("%s\n", json_object_get_string(o));
155 } 155 }