| From 5ae81386a8cfea4180738c261cd3f7944a631199 Mon Sep 17 00:00:00 2001 |
| From: Khem Raj <raj.khem@gmail.com> |
| Date: Wed, 3 Jun 2020 16:03:56 -0700 |
| Subject: [PATCH] fix boolean value with json-c 0.14 |
| |
| Patch from Christian Hesse posted here |
| https://www.spinics.net/lists/dm-devel/msg40646.html |
| |
| Upstream json-c 0.14+ removed the TRUE and FALSE defines in commit |
| 0992aac61f8b087efd7094e9ac2b84fa9c040fcd. |
| |
| Upstream-Status: Submitted [https://www.spinics.net/lists/dm-devel/msg40646.html] |
| Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| --- |
| libdmmp/libdmmp_private.h | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/libdmmp/libdmmp_private.h b/libdmmp/libdmmp_private.h |
| index ac85b63f..29400826 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; \ |
| @@ -90,7 +90,7 @@ do { \ |
| } \ |
| if (j_obj_tmp == NULL) { \ |
| _error(ctx, "BUG: Got NULL j_obj_tmp from " \ |
| - "json_object_object_get_ex() while it return TRUE"); \ |
| + "json_object_object_get_ex() while it return 1"); \ |
| rc = DMMP_ERR_BUG; \ |
| goto out; \ |
| } \ |
| -- |
| 2.27.0 |
| |