From 88ccf287859a7cc3cff24e831dade9806bb986b1 Mon Sep 17 00:00:00 2001 From: Marcin Cieslak Date: Sat, 13 Sep 2014 21:05:57 +0000 Subject: [PATCH 05/10] libxl: Use yajl_gen_status_ok where appropriate Signed-off-by: Marcin Cieslak --- tools/libxl/libxl_internal.h | 2 +- tools/libxl/libxl_json.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index f61673c..b176046 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1772,7 +1772,7 @@ libxl__json_map_node *libxl__json_map_node_get(const libxl__json_object *o, _hidden const libxl__json_object *libxl__json_map_get(const char *key, const libxl__json_object *o, libxl__json_node_type expected_type); -_hidden yajl_status libxl__json_object_to_yajl_gen(libxl__gc *gc_opt, +_hidden yajl_gen_status libxl__json_object_to_yajl_gen(libxl__gc *gc_opt, yajl_gen hand, libxl__json_object *param); _hidden void libxl__json_object_free(libxl__gc *gc_opt, diff --git a/tools/libxl/libxl_json.c b/tools/libxl/libxl_json.c index ceb014a..1481140 100644 --- a/tools/libxl/libxl_json.c +++ b/tools/libxl/libxl_json.c @@ -610,12 +610,12 @@ const libxl__json_object *libxl__json_map_get(const char *key, return NULL; } -yajl_status libxl__json_object_to_yajl_gen(libxl__gc *gc, +yajl_gen_status libxl__json_object_to_yajl_gen(libxl__gc *gc, yajl_gen hand, libxl__json_object *obj) { int idx = 0; - yajl_status rc; + yajl_gen_status rc; switch (obj->type) { case JSON_NULL: @@ -634,17 +634,17 @@ yajl_status libxl__json_object_to_yajl_gen(libxl__gc *gc, libxl__json_map_node *node = NULL; rc = yajl_gen_map_open(hand); - if (rc != yajl_status_ok) + if (rc != yajl_gen_status_ok) return rc; for (idx = 0; idx < obj->u.map->count; idx++) { if (flexarray_get(obj->u.map, idx, (void**)&node) != 0) break; rc = libxl__yajl_gen_asciiz(hand, node->map_key); - if (rc != yajl_status_ok) + if (rc != yajl_gen_status_ok) return rc; rc = libxl__json_object_to_yajl_gen(gc, hand, node->obj); - if (rc != yajl_status_ok) + if (rc != yajl_gen_status_ok) return rc; } return yajl_gen_map_close(hand); -- 2.0.2