[libvirt] [PATCH v6 2/9] util: add functions for interating over json object

[Daniel P. Berrange]

On Wed, May 02, 2012 at 10:32:37PM +0400, Dmitry Guryanov wrote:
> Add function virJSONValueObjectKeysNumber, virJSONValueObjectGetKey
> and virJSONValueObjectGetValue, which allow you to iterate over all
> fields of json object: you can get number of fields and then get
> name and value, stored in field with that name by index.
> 
> Signed-off-by: Dmitry Guryanov <dguryanov at parallels.com>
> ---
>  src/util/json.c |   30 ++++++++++++++++++++++++++++++
>  src/util/json.h |    4 ++++
>  2 files changed, 34 insertions(+), 0 deletions(-)
> 
> diff --git a/src/util/json.c b/src/util/json.c
> index 3258c3f..e7dc272 100644
> --- a/src/util/json.c
> +++ b/src/util/json.c
> @@ -431,6 +431,36 @@ virJSONValuePtr virJSONValueObjectGet(virJSONValuePtr object, const char *key)
>      return NULL;
>  }
>  
> +int virJSONValueObjectKeysNumber(virJSONValuePtr object)
> +{
> +    if (object->type != VIR_JSON_TYPE_OBJECT)
> +        return -1;
> +
> +    return object->data.object.npairs;
> +}
> +
> +const char *virJSONValueObjectGetKey(virJSONValuePtr object, unsigned int n)
> +{
> +    if (object->type != VIR_JSON_TYPE_OBJECT)
> +        return NULL;
> +
> +    if (n >= object->data.object.npairs)
> +        return NULL;
> +
> +    return object->data.object.pairs[n].key;
> +}
> +
> +virJSONValuePtr virJSONValueObjectGetValue(virJSONValuePtr object, unsigned int n)
> +{
> +    if (object->type != VIR_JSON_TYPE_OBJECT)
> +        return NULL;
> +
> +    if (n >= object->data.object.npairs)
> +        return NULL;
> +
> +    return object->data.object.pairs[n].value;
> +}
> +
>  int virJSONValueArraySize(virJSONValuePtr array)
>  {
>      if (array->type != VIR_JSON_TYPE_ARRAY)
> diff --git a/src/util/json.h b/src/util/json.h
> index 686a8fb..436405f 100644
> --- a/src/util/json.h
> +++ b/src/util/json.h
> @@ -100,6 +100,10 @@ virJSONValuePtr virJSONValueObjectGet(virJSONValuePtr object, const char *key);
>  int virJSONValueArraySize(virJSONValuePtr object);
>  virJSONValuePtr virJSONValueArrayGet(virJSONValuePtr object, unsigned int element);
>  
> +int virJSONValueObjectKeysNumber(virJSONValuePtr object);
> +const char *virJSONValueObjectGetKey(virJSONValuePtr object, unsigned int n);
> +virJSONValuePtr virJSONValueObjectGetValue(virJSONValuePtr object, unsigned int n);
> +
>  const char *virJSONValueGetString(virJSONValuePtr object);
>  int virJSONValueGetNumberInt(virJSONValuePtr object, int *value);
>  int virJSONValueGetNumberUint(virJSONValuePtr object, unsigned int *value);

ACK to adding this API to GIT now, regardless of the other patches

Though having said that when pushing, we should be sure to add the
3 new symbols to libvirt_private.syms

Regards,
Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|