mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
libxl: add explicit casts from yajl_gen_status to yajl_status
Or else clang complains with: implicit conversion from enumeration type 'yajl_gen_status' to different enumeration type 'yajl_status' [-Werror,-Wenum-conversion] Signed-off-by: Roger Pau Monné <roger.pau@citrix.com> Acked-by: Wei Liu <wei.liu2@citrix.com> [ wei: remove extraneous ";" ] Release-acked-by: Wei Liu <wei.liu2@citrix.com>
This commit is contained in:
Roger Pau Monne authored and Wei Liu committed
1 parent
99507d2793
commit
50f8537631
1 file changed
+18
-11
+18
-11
@@ -617,42 +617,48 @@ yajl_status libxl__json_object_to_yajl_gen(libxl__gc *gc,
|
||||
int idx = 0;
|
||||
yajl_status rc;
|
||||
|
||||
#define CONVERT_YAJL_GEN_TO_STATUS(gen) \
|
||||
((gen) == yajl_gen_status_ok ? yajl_status_ok : yajl_status_error)
|
||||
|
||||
switch (obj->type) {
|
||||
case JSON_NULL:
|
||||
return yajl_gen_null(hand);
|
||||
return CONVERT_YAJL_GEN_TO_STATUS(yajl_gen_null(hand));
|
||||
case JSON_BOOL:
|
||||
return yajl_gen_bool(hand, obj->u.b);
|
||||
return CONVERT_YAJL_GEN_TO_STATUS(yajl_gen_bool(hand, obj->u.b));
|
||||
case JSON_INTEGER:
|
||||
return yajl_gen_integer(hand, obj->u.i);
|
||||
return CONVERT_YAJL_GEN_TO_STATUS(yajl_gen_integer(hand, obj->u.i));
|
||||
case JSON_DOUBLE:
|
||||
return yajl_gen_double(hand, obj->u.d);
|
||||
return CONVERT_YAJL_GEN_TO_STATUS(yajl_gen_double(hand, obj->u.d));
|
||||
case JSON_NUMBER:
|
||||
return yajl_gen_number(hand, obj->u.string, strlen(obj->u.string));
|
||||
return CONVERT_YAJL_GEN_TO_STATUS(
|
||||
yajl_gen_number(hand, obj->u.string, strlen(obj->u.string)));
|
||||
case JSON_STRING:
|
||||
return libxl__yajl_gen_asciiz(hand, obj->u.string);
|
||||
return CONVERT_YAJL_GEN_TO_STATUS(
|
||||
libxl__yajl_gen_asciiz(hand, obj->u.string));
|
||||
case JSON_MAP: {
|
||||
libxl__json_map_node *node = NULL;
|
||||
|
||||
rc = yajl_gen_map_open(hand);
|
||||
rc = CONVERT_YAJL_GEN_TO_STATUS(yajl_gen_map_open(hand));
|
||||
if (rc != yajl_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);
|
||||
rc = CONVERT_YAJL_GEN_TO_STATUS(
|
||||
libxl__yajl_gen_asciiz(hand, node->map_key));
|
||||
if (rc != yajl_status_ok)
|
||||
return rc;
|
||||
rc = libxl__json_object_to_yajl_gen(gc, hand, node->obj);
|
||||
if (rc != yajl_status_ok)
|
||||
return rc;
|
||||
}
|
||||
return yajl_gen_map_close(hand);
|
||||
return CONVERT_YAJL_GEN_TO_STATUS(yajl_gen_map_close(hand));
|
||||
}
|
||||
case JSON_ARRAY: {
|
||||
libxl__json_object *node = NULL;
|
||||
|
||||
rc = yajl_gen_array_open(hand);
|
||||
rc = CONVERT_YAJL_GEN_TO_STATUS(yajl_gen_array_open(hand));
|
||||
if (rc != yajl_status_ok)
|
||||
return rc;
|
||||
for (idx = 0; idx < obj->u.array->count; idx++) {
|
||||
@@ -662,13 +668,14 @@ yajl_status libxl__json_object_to_yajl_gen(libxl__gc *gc,
|
||||
if (rc != yajl_status_ok)
|
||||
return rc;
|
||||
}
|
||||
return yajl_gen_array_close(hand);
|
||||
return CONVERT_YAJL_GEN_TO_STATUS(yajl_gen_array_close(hand));
|
||||
}
|
||||
case JSON_ANY:
|
||||
/* JSON_ANY is not a valid value for obj->type. */
|
||||
;
|
||||
}
|
||||
abort();
|
||||
#undef CONVERT_YAJL_GEN_TO_STATUS
|
||||
}
|
||||
|
||||
|
||||
|
||||