[Xen-devel] [PATCHv4 01/11] libxl_json: Export json_object related function.

[Alex Bligh <alex@xxxxxxxxxxx>]

Export libxl__json_object_alloc and libxl__json_object_append_to to
use them in a later patch.

Backported from xen-unstable patch:
: User Anthony PERARD <anthony.perard@xxxxxxxxxx>
: Date 1349693129 -3600
: Node ID c9b80c7f8db1a5d26906a2298c481bf7e87fda94
: Parent  93e3e6a33e0a1ec9f92fc575334caa35e6dbc757

Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Signed-off-by: Alex Bligh <alex@xxxxxxxxxxx>
---
 tools/libxl/libxl_internal.h |   14 ++++++++++++--
 tools/libxl/libxl_json.c     |   32 ++++++++++++++++----------------
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index a135cd7..2959527 100644
*** a/tools/libxl/libxl_internal.h
--- b/tools/libxl/libxl_internal.h
***************
*** 1512,1517 ****
--- 1512,1526 ----
          return -1;
  }
  
+ /*
+  * NOGC can be used with those json_object functions, but the
+  * libxl__json_object* will need to be freed with libxl__json_object_free.
+  */
+ _hidden libxl__json_object *libxl__json_object_alloc(libxl__gc *gc_opt,
+                                                      libxl__json_node_type 
type);
+ _hidden int libxl__json_object_append_to(libxl__gc *gc_opt,
+                                          libxl__json_object *obj,
+                                          libxl__json_object *dst);
  _hidden libxl__json_object *libxl__json_array_get(const libxl__json_object *o,
                                                    int i);
  _hidden
***************
*** 1520,1528 ****
  _hidden const libxl__json_object *libxl__json_map_get(const char *key,
                                            const libxl__json_object *o,
                                            libxl__json_node_type 
expected_type);
! _hidden void libxl__json_object_free(libxl__gc *gc, libxl__json_object *obj);
  
! _hidden libxl__json_object *libxl__json_parse(libxl__gc *gc, const char *s);
  
    /* Based on /local/domain/$domid/dm-version xenstore key
     * default is qemu xen traditional */
--- 1529,1538 ----
  _hidden const libxl__json_object *libxl__json_map_get(const char *key,
                                            const libxl__json_object *o,
                                            libxl__json_node_type 
expected_type);
! _hidden void libxl__json_object_free(libxl__gc *gc_opt,
!                                      libxl__json_object *obj);
  
! _hidden libxl__json_object *libxl__json_parse(libxl__gc *gc_opt, const char 
*s);
  
    /* Based on /local/domain/$domid/dm-version xenstore key
     * default is qemu xen traditional */
diff --git a/tools/libxl/libxl_json.c b/tools/libxl/libxl_json.c
index caa8312..0b0cf2f 100644
*** a/tools/libxl/libxl_json.c
--- b/tools/libxl/libxl_json.c
***************
*** 205,211 ****
   * libxl__json_object helper functions
   */
  
! static libxl__json_object *json_object_alloc(libxl__gc *gc,
                                               libxl__json_node_type type)
  {
      libxl__json_object *obj;
--- 205,211 ----
   * libxl__json_object helper functions
   */
  
! libxl__json_object *libxl__json_object_alloc(libxl__gc *gc,
                                               libxl__json_node_type type)
  {
      libxl__json_object *obj;
***************
*** 236,242 ****
      return obj;
  }
  
! static int json_object_append_to(libxl__gc *gc,
                                   libxl__json_object *obj,
                                   libxl__json_object *dst)
  {
--- 236,242 ----
      return obj;
  }
  
! int libxl__json_object_append_to(libxl__gc *gc,
                                   libxl__json_object *obj,
                                   libxl__json_object *dst)
  {
***************
*** 393,402 ****
  
      DEBUG_GEN(ctx, null);
  
!     if ((obj = json_object_alloc(ctx->gc, JSON_NULL)) == NULL)
          return 0;
  
!     if (json_object_append_to(ctx->gc, obj, ctx->current) == -1) {
          libxl__json_object_free(ctx->gc, obj);
          return 0;
      }
--- 393,402 ----
  
      DEBUG_GEN(ctx, null);
  
!     if ((obj = libxl__json_object_alloc(ctx->gc, JSON_NULL)) == NULL)
          return 0;
  
!     if (libxl__json_object_append_to(ctx->gc, obj, ctx->current) == -1) {
          libxl__json_object_free(ctx->gc, obj);
          return 0;
      }
***************
*** 411,421 ****
  
      DEBUG_GEN_VALUE(ctx, bool, boolean);
  
!     if ((obj = json_object_alloc(ctx->gc,
                                   boolean ? JSON_TRUE : JSON_FALSE)) == NULL)
          return 0;
  
!     if (json_object_append_to(ctx->gc, obj, ctx->current) == -1) {
          libxl__json_object_free(ctx->gc, obj);
          return 0;
      }
--- 411,421 ----
  
      DEBUG_GEN_VALUE(ctx, bool, boolean);
  
!     if ((obj = libxl__json_object_alloc(ctx->gc,
                                   boolean ? JSON_TRUE : JSON_FALSE)) == NULL)
          return 0;
  
!     if (libxl__json_object_append_to(ctx->gc, obj, ctx->current) == -1) {
          libxl__json_object_free(ctx->gc, obj);
          return 0;
      }
***************
*** 448,454 ****
              goto error;
          }
  
!         if ((obj = json_object_alloc(ctx->gc, JSON_DOUBLE)) == NULL)
              return 0;
          obj->u.d = d;
      } else {
--- 448,454 ----
              goto error;
          }
  
!         if ((obj = libxl__json_object_alloc(ctx->gc, JSON_DOUBLE)) == NULL)
              return 0;
          obj->u.d = d;
      } else {
***************
*** 458,464 ****
              goto error;
          }
  
!         if ((obj = json_object_alloc(ctx->gc, JSON_INTEGER)) == NULL)
              return 0;
          obj->u.i = i;
      }
--- 458,464 ----
              goto error;
          }
  
!         if ((obj = libxl__json_object_alloc(ctx->gc, JSON_INTEGER)) == NULL)
              return 0;
          obj->u.i = i;
      }
***************
*** 466,472 ****
  
  error:
      /* If the conversion fail, we just store the original string. */
!     if ((obj = json_object_alloc(ctx->gc, JSON_NUMBER)) == NULL)
          return 0;
  
      t = malloc(len + 1);
--- 466,472 ----
  
  error:
      /* If the conversion fail, we just store the original string. */
!     if ((obj = libxl__json_object_alloc(ctx->gc, JSON_NUMBER)) == NULL)
          return 0;
  
      t = malloc(len + 1);
***************
*** 481,487 ****
      obj->u.string = t;
  
  out:
!     if (json_object_append_to(ctx->gc, obj, ctx->current) == -1) {
          libxl__json_object_free(ctx->gc, obj);
          return 0;
      }
--- 481,487 ----
      obj->u.string = t;
  
  out:
!     if (libxl__json_object_append_to(ctx->gc, obj, ctx->current) == -1) {
          libxl__json_object_free(ctx->gc, obj);
          return 0;
      }
***************
*** 508,520 ****
      strncpy(t, (const char *) str, len);
      t[len] = 0;
  
!     if ((obj = json_object_alloc(ctx->gc, JSON_STRING)) == NULL) {
          free(t);
          return 0;
      }
      obj->u.string = t;
  
!     if (json_object_append_to(ctx->gc, obj, ctx->current) == -1) {
          libxl__json_object_free(ctx->gc, obj);
          return 0;
      }
--- 508,520 ----
      strncpy(t, (const char *) str, len);
      t[len] = 0;
  
!     if ((obj = libxl__json_object_alloc(ctx->gc, JSON_STRING)) == NULL) {
          free(t);
          return 0;
      }
      obj->u.string = t;
  
!     if (libxl__json_object_append_to(ctx->gc, obj, ctx->current) == -1) {
          libxl__json_object_free(ctx->gc, obj);
          return 0;
      }
***************
*** 573,583 ****
  
      DEBUG_GEN(ctx, map_open);
  
!     if ((obj = json_object_alloc(ctx->gc, JSON_MAP)) == NULL)
          return 0;
  
      if (ctx->current) {
!         if (json_object_append_to(ctx->gc, obj, ctx->current) == -1) {
              libxl__json_object_free(ctx->gc, obj);
              return 0;
          }
--- 573,583 ----
  
      DEBUG_GEN(ctx, map_open);
  
!     if ((obj = libxl__json_object_alloc(ctx->gc, JSON_MAP)) == NULL)
          return 0;
  
      if (ctx->current) {
!         if (libxl__json_object_append_to(ctx->gc, obj, ctx->current) == -1) {
              libxl__json_object_free(ctx->gc, obj);
              return 0;
          }
***************
*** 615,625 ****
  
      DEBUG_GEN(ctx, array_open);
  
!     if ((obj = json_object_alloc(ctx->gc, JSON_ARRAY)) == NULL)
          return 0;
  
      if (ctx->current) {
!         if (json_object_append_to(ctx->gc, obj, ctx->current) == -1) {
              libxl__json_object_free(ctx->gc, obj);
              return 0;
          }
- - 
--- 615,625 ----
  
      DEBUG_GEN(ctx, array_open);
  
!     if ((obj = libxl__json_object_alloc(ctx->gc, JSON_ARRAY)) == NULL)
          return 0;
  
      if (ctx->current) {
!         if (libxl__json_object_append_to(ctx->gc, obj, ctx->current) == -1) {
              libxl__json_object_free(ctx->gc, obj);
              return 0;
          }
1.7.4.1


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel