aboutsummaryrefslogtreecommitdiffstats
path: root/tools/libxl/libxl_json.c
diff options
context:
space:
mode:
authorAnthony PERARD <anthony.perard@citrix.com>2012-10-08 11:45:29 +0100
committerAnthony PERARD <anthony.perard@citrix.com>2012-10-08 11:45:29 +0100
commitcb78a973ef6254fa4fa9dc020de9fb2e65d07015 (patch)
tree4600cb15b937e0d9ffd21b0c7ffaa7a1d0006ada /tools/libxl/libxl_json.c
parent4457702a84713bf06dc861bc2873b964dd6fa949 (diff)
downloadxen-cb78a973ef6254fa4fa9dc020de9fb2e65d07015.tar.gz
xen-cb78a973ef6254fa4fa9dc020de9fb2e65d07015.tar.bz2
xen-cb78a973ef6254fa4fa9dc020de9fb2e65d07015.zip
libxl_json: Export json_object related function.
Export libxl__json_object_alloc and libxl__json_object_append_to to use them in a later patch. Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> Acked-by: Ian Campbell <ian.campbell@citrix.com> Committed-by: Ian Campbell <ian.campbell@citrix.com>
Diffstat (limited to 'tools/libxl/libxl_json.c')
-rw-r--r--tools/libxl/libxl_json.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/tools/libxl/libxl_json.c b/tools/libxl/libxl_json.c
index 3cba48fe07..a045594aa1 100644
--- a/tools/libxl/libxl_json.c
+++ b/tools/libxl/libxl_json.c
@@ -205,7 +205,7 @@ yajl_gen_status libxl__string_gen_json(yajl_gen hand,
* libxl__json_object helper functions
*/
-static libxl__json_object *json_object_alloc(libxl__gc *gc,
+libxl__json_object *libxl__json_object_alloc(libxl__gc *gc,
libxl__json_node_type type)
{
libxl__json_object *obj;
@@ -225,7 +225,7 @@ static libxl__json_object *json_object_alloc(libxl__gc *gc,
return obj;
}
-static int json_object_append_to(libxl__gc *gc,
+int libxl__json_object_append_to(libxl__gc *gc,
libxl__json_object *obj,
libxl__json_object *dst)
{
@@ -378,9 +378,9 @@ static int json_callback_null(void *opaque)
DEBUG_GEN(ctx, null);
- obj = json_object_alloc(ctx->gc, JSON_NULL);
+ obj = libxl__json_object_alloc(ctx->gc, JSON_NULL);
- if (json_object_append_to(ctx->gc, obj, ctx->current) == -1) {
+ if (libxl__json_object_append_to(ctx->gc, obj, ctx->current) == -1) {
return 0;
}
@@ -394,10 +394,10 @@ static int json_callback_boolean(void *opaque, int boolean)
DEBUG_GEN_VALUE(ctx, bool, boolean);
- obj = json_object_alloc(ctx->gc,
- boolean ? JSON_TRUE : JSON_FALSE);
+ obj = libxl__json_object_alloc(ctx->gc,
+ boolean ? JSON_TRUE : JSON_FALSE);
- if (json_object_append_to(ctx->gc, obj, ctx->current) == -1) {
+ if (libxl__json_object_append_to(ctx->gc, obj, ctx->current) == -1) {
return 0;
}
@@ -429,7 +429,7 @@ static int json_callback_number(void *opaque, const char *s, libxl_yajl_length l
goto error;
}
- obj = json_object_alloc(ctx->gc, JSON_DOUBLE);
+ obj = libxl__json_object_alloc(ctx->gc, JSON_DOUBLE);
obj->u.d = d;
} else {
long long i = strtoll(s, NULL, 10);
@@ -438,14 +438,14 @@ static int json_callback_number(void *opaque, const char *s, libxl_yajl_length l
goto error;
}
- obj = json_object_alloc(ctx->gc, JSON_INTEGER);
+ obj = libxl__json_object_alloc(ctx->gc, JSON_INTEGER);
obj->u.i = i;
}
goto out;
error:
/* If the conversion fail, we just store the original string. */
- obj = json_object_alloc(ctx->gc, JSON_NUMBER);
+ obj = libxl__json_object_alloc(ctx->gc, JSON_NUMBER);
t = libxl__zalloc(ctx->gc, len + 1);
strncpy(t, s, len);
@@ -454,7 +454,7 @@ error:
obj->u.string = t;
out:
- if (json_object_append_to(ctx->gc, obj, ctx->current) == -1) {
+ if (libxl__json_object_append_to(ctx->gc, obj, ctx->current) == -1) {
return 0;
}
@@ -475,10 +475,10 @@ static int json_callback_string(void *opaque, const unsigned char *str,
strncpy(t, (const char *) str, len);
t[len] = 0;
- obj = json_object_alloc(ctx->gc, JSON_STRING);
+ obj = libxl__json_object_alloc(ctx->gc, JSON_STRING);
obj->u.string = t;
- if (json_object_append_to(ctx->gc, obj, ctx->current) == -1) {
+ if (libxl__json_object_append_to(ctx->gc, obj, ctx->current) == -1) {
return 0;
}
@@ -524,10 +524,10 @@ static int json_callback_start_map(void *opaque)
DEBUG_GEN(ctx, map_open);
- obj = json_object_alloc(ctx->gc, JSON_MAP);
+ obj = libxl__json_object_alloc(ctx->gc, JSON_MAP);
if (ctx->current) {
- if (json_object_append_to(ctx->gc, obj, ctx->current) == -1) {
+ if (libxl__json_object_append_to(ctx->gc, obj, ctx->current) == -1) {
return 0;
}
}
@@ -564,10 +564,10 @@ static int json_callback_start_array(void *opaque)
DEBUG_GEN(ctx, array_open);
- obj = json_object_alloc(ctx->gc, JSON_ARRAY);
+ obj = libxl__json_object_alloc(ctx->gc, JSON_ARRAY);
if (ctx->current) {
- if (json_object_append_to(ctx->gc, obj, ctx->current) == -1) {
+ if (libxl__json_object_append_to(ctx->gc, obj, ctx->current) == -1) {
return 0;
}
}