1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
From 0db8dc6022f67a4e1f49397b8bf519b2a34f74c9 Mon Sep 17 00:00:00 2001
From: Jelle van der Waa <jelle@vdwaa.nl>
Date: Wed, 27 Dec 2017 11:05:45 +0100
Subject: [PATCH] Replace removed is_error macro
The json-c library removed the is_error macro in 0.13, replaced the
macro calls with a != NULL statement.
Bug-Debian: https://bugs.debian.org/915839
Bug: https://github.com/gregkh/bti/pull/44
--- a/bti.c
+++ b/bti.c
@@ -454,7 +454,7 @@
struct json_object *val; \
struct lh_entry *entry; \
for (entry = json_object_get_object(obj)->head; \
- ({ if(entry && !is_error(entry)) { \
+ ({ if(entry && entry != NULL) { \
key = (char*)entry->k; \
val = (struct json_object*)entry->v; \
} ; entry; }); \
@@ -670,7 +670,7 @@
/* make global for now */
store_session = session;
- if (!is_error(jobj)) {
+ if (jobj != NULL) {
/* guards against a json pre 0.10 bug */
json_parse(jobj,0);
}
@@ -695,7 +695,7 @@
/* make global for now */
store_session = session;
- if (!is_error(jobj)) {
+ if (jobj != NULL) {
/* guards against a json pre 0.10 bug */
if (json_object_get_type(jobj)==json_type_array) {
json_parse_array(jobj, NULL, 0);
|
