[libvirt] [PATCH 05/10] json: assume WITH_YAJL2

[Daniel P. Berrangé]

On Wed, Apr 03, 2019 at 07:40:20AM +0200, Ján Tomko wrote:
> Now that we require YAJL2, drop the code dealing with YAJL 1.
> 
> Signed-off-by: Ján Tomko <jtomko at redhat.com>
> ---
>  src/util/virjson.c | 55 +++-------------------------------------------
>  1 file changed, 3 insertions(+), 52 deletions(-)
> 
> diff --git a/src/util/virjson.c b/src/util/virjson.c
> index d5d66f879f..b163d5c1cb 100644
> --- a/src/util/virjson.c
> +++ b/src/util/virjson.c
> @@ -33,16 +33,8 @@
>  # include <yajl/yajl_gen.h>
>  # include <yajl/yajl_parse.h>
>  
> -# ifdef WITH_YAJL2
> -#  define yajl_size_t size_t
> -#  define VIR_YAJL_STATUS_OK(status) ((status) == yajl_status_ok)
> -# else
> -#  define yajl_size_t unsigned int
> -#  define yajl_complete_parse yajl_parse_complete
> -#  define VIR_YAJL_STATUS_OK(status) \
> -    ((status) == yajl_status_ok || (status) == yajl_status_insufficient_data)
> -# endif
> -
> +# define yajl_size_t size_t
> +# define VIR_YAJL_STATUS_OK(status) ((status) == yajl_status_ok)

IMHO we should be getting rid of these two macros too as they only
exist to deal with portability differences, though I'm fine if that's
done in a separate commit.


Reviewed-by: Daniel P. Berrangé <berrange at redhat.com>


Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|