summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>2010-08-13 07:41:07 +0200
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>2010-08-13 07:41:07 +0200
commit271219ac31c22f4a7f53c87c054e642040e91877 (patch)
tree3ed4470a79520a10bccc9773aa2029c438fee216
parentd1c57f65d722eef41a9e10f29ce7983d64620c7a (diff)
downloadyajl-271219ac31c22f4a7f53c87c054e642040e91877.tar.gz
yajl_tree.[ch]: Rename the "children" member of yajl_value_array_t to "values".
-rw-r--r--src/api/yajl_tree.h4
-rw-r--r--src/yajl_tree.c20
2 files changed, 12 insertions, 12 deletions
diff --git a/src/api/yajl_tree.h b/src/api/yajl_tree.h
index 5a6d3b3..663ba8e 100644
--- a/src/api/yajl_tree.h
+++ b/src/api/yajl_tree.h
@@ -101,9 +101,9 @@ typedef struct yajl_value_object_s yajl_value_object_t;
struct yajl_value_array_s
{
/** Array of elements in the JSON array. */
- yajl_value_t **children;
+ yajl_value_t **values;
/** Number of elements in the JSON array. */
- size_t children_num;
+ size_t values_num;
};
typedef struct yajl_value_array_s yajl_value_array_t;
diff --git a/src/yajl_tree.c b/src/yajl_tree.c
index 8839434..f0f931e 100644
--- a/src/yajl_tree.c
+++ b/src/yajl_tree.c
@@ -102,13 +102,13 @@ static void yajl_array_free (yajl_value_t *v) /* {{{ */
if (a == NULL)
return;
- for (i = 0; i < a->children_num; i++)
+ for (i = 0; i < a->values_num; i++)
{
- yajl_tree_free (a->children[i]);
- a->children[i] = NULL;
+ yajl_tree_free (a->values[i]);
+ a->values[i] = NULL;
}
- free (a->children);
+ free (a->values);
free (v);
} /* }}} void yajl_array_free */
@@ -203,12 +203,12 @@ static int array_add_value (yajl_value_t *array, /* {{{ */
if (a == NULL)
return (EINVAL);
- tmp = realloc (a->children, sizeof (*a->children) * (a->children_num + 1));
+ tmp = realloc (a->values, sizeof (*a->values) * (a->values_num + 1));
if (tmp == NULL)
return (ENOMEM);
- a->children = tmp;
- a->children[a->children_num] = value;
- a->children_num++;
+ a->values = tmp;
+ a->values[a->values_num] = value;
+ a->values_num++;
return (0);
} /* }}} int array_add_value */
@@ -364,8 +364,8 @@ static int handle_start_array (void *ctx) /* {{{ */
return (STATUS_ABORT);
a = YAJL_TO_ARRAY (v);
- a->children = NULL;
- a->children_num = 0;
+ a->values = NULL;
+ a->values_num = 0;
return ((context_push (ctx, v) == 0) ? STATUS_CONTINUE : STATUS_ABORT);
} /* }}} int handle_start_array */