[dm-devel] [PATCH 1/1] libdmmp: Add support for upcoming json-c 0.14.0.

Benjamin Marzinski bmarzins at redhat.com
Fri May 29 04:10:43 UTC 2020


From: Björn Esser <besser82 at fedoraproject.org>

TRUE/FALSE are not defined anymore.  1 and 0 are used instead.
This is backwards compatible, as earlier versions of json-c are
using the same integer values in their present definitions.

Signed-off-by: Benjamin Marzinski <bmarzins at redhat.com>
---
 libdmmp/libdmmp_private.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libdmmp/libdmmp_private.h b/libdmmp/libdmmp_private.h
index ac85b63f..4378962b 100644
--- a/libdmmp/libdmmp_private.h
+++ b/libdmmp/libdmmp_private.h
@@ -82,7 +82,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) != 1) { \
 		_error(ctx, "Invalid JSON output from multipathd IPC: " \
 		       "key '%s' not found", key); \
 		rc = DMMP_ERR_IPC_ERROR; \
-- 
2.17.2




More information about the dm-devel mailing list