summaryrefslogtreecommitdiff
path: root/json_object.c
diff options
context:
space:
mode:
authorEric Haszlakiewicz <erh+git@nimenees.com>2016-05-23 02:08:28 +0000
committerEric Haszlakiewicz <erh+git@nimenees.com>2016-05-23 02:08:28 +0000
commit9a2915ce6603bfcd3de99f3111fe56cc2b4f02bd (patch)
tree76b9c8a518efc84a09b4fde9051bc8c85eb871a5 /json_object.c
parentb2c5969affa90414a2a20291909c33bcd9ab19cd (diff)
parent92e9a5032bc38ffef09b33991f035a423d5f79a4 (diff)
downloadjson-c-9a2915ce6603bfcd3de99f3111fe56cc2b4f02bd.tar.gz
Merge branch 'fixes-for-upstream' of https://github.com/doctaweeks/json-c into doctaweeks-fixes-for-upstream
Diffstat (limited to 'json_object.c')
-rw-r--r--json_object.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/json_object.c b/json_object.c
index 46701e7..b0b381e 100644
--- a/json_object.c
+++ b/json_object.c
@@ -879,7 +879,7 @@ static int json_object_array_to_json_string(struct json_object* jso,
int flags)
{
int had_children = 0;
- int ii;
+ size_t ii;
sprintbuf(pb, "[");
if (flags & JSON_C_TO_STRING_PRETTY)
sprintbuf(pb, "\n");
@@ -975,7 +975,7 @@ struct json_object* json_object_array_bsearch(
return *result;
}
-int json_object_array_length(const struct json_object *jso)
+size_t json_object_array_length(const struct json_object *jso)
{
return array_list_length(jso->o.c_array);
}
@@ -985,14 +985,14 @@ int json_object_array_add(struct json_object *jso,struct json_object *val)
return array_list_add(jso->o.c_array, val);
}
-int json_object_array_put_idx(struct json_object *jso, int idx,
+int json_object_array_put_idx(struct json_object *jso, size_t idx,
struct json_object *val)
{
return array_list_put_idx(jso->o.c_array, idx, val);
}
struct json_object* json_object_array_get_idx(const struct json_object *jso,
- int idx)
+ size_t idx)
{
return (struct json_object*)array_list_get_idx(jso->o.c_array, idx);
}