[dm-devel] [PATCH] fix boolean value with json-c 0.14

[mwilck at suse.com]

From: "mail at eworm.de" <mail at eworm.de>

Upstream json-c removed the TRUE and FALSE defines in commit
0992aac61f8b087efd7094e9ac2b84fa9c040fcd.


Signed-off-by: Christian Hesse <mail at eworm.de>
Signed-off-by: Martin Wilck <mwilck at suse.com>
---
 libdmmp/libdmmp_private.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

---
mwilck: Resent from Christian's patch from 2020-04-25.
Changes wrt original patch:
 - Use stdbool.h, and keep the error message unchanged.

(Resent, as I forgot to cc dm-devel. Sorry!)

diff --git a/libdmmp/libdmmp_private.h b/libdmmp/libdmmp_private.h
index ac85b63f..b1a6ddea 100644
--- a/libdmmp/libdmmp_private.h
+++ b/libdmmp/libdmmp_private.h
@@ -30,6 +30,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <assert.h>
+#include <stdbool.h>
 #include <json.h>
 
 #include "libdmmp/libdmmp.h"
@@ -82,7 +83,7 @@ static out_type func_name(struct dmmp_context *ctx, const char *var_name) { \
 do { \
 	json_type j_type = json_type_null; \
 	json_object *j_obj_tmp = NULL; \
-	if (json_object_object_get_ex(j_obj, key, &j_obj_tmp) != TRUE) { \
+	if (json_object_object_get_ex(j_obj, key, &j_obj_tmp) != true) { \
 		_error(ctx, "Invalid JSON output from multipathd IPC: " \
 		       "key '%s' not found", key); \
 		rc = DMMP_ERR_IPC_ERROR; \
-- 
2.26.2