[dm-devel] [PATCH 1/1] libdmmp: Add support for upcoming json-c 0.14.0.
Martin Wilck
Martin.Wilck at suse.com
Fri May 29 09:12:30 UTC 2020
Hi Ben,
On Thu, 2020-05-28 at 23:10 -0500, Benjamin Marzinski wrote:
> 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; \
Did you see
https://www.redhat.com/archives/dm-devel/2020-May/msg00261.html ?
This has first been reported to the list by Christian (
https://www.redhat.com/archives/dm-devel/2020-April/msg00261.html), and
brought to my attention later by Xose. I personally thought the change
from boolean to int is a step in the wrong direction, therefore I
submitted my modified version using stdboolh. If everyone else is fine
with the int, it's not worth arguing about it.
Regards,
Martin
PS: Can anyone explain why json-c did this? Looks like a "cause hassle
for downstream devs and users for no good reason" kind of thing to
me...
--
Dr. Martin Wilck <mwilck at suse.com>, Tel. +49 (0)911 74053 2107
SUSE Software Solutions Germany GmbH
HRB 36809, AG Nürnberg GF: Felix
Imendörffer
More information about the dm-devel
mailing list