Merge branch 'fixes-for-upstream' of https://github.com/doctaweeks/json-c into doctaweeks-fixes-for-upstream

This commit is contained in:
Eric Haszlakiewicz
2016-05-23 02:08:28 +00:00
4 changed files with 18 additions and 18 deletions

View File

@@ -457,7 +457,7 @@ extern struct array_list* json_object_get_array(const struct json_object *obj);
* @param obj the json_object instance
* @returns an int
*/
extern int json_object_array_length(const struct json_object *obj);
extern size_t json_object_array_length(const struct json_object *obj);
/** Sorts the elements of jso of type json_type_array
*
@@ -515,7 +515,7 @@ extern int json_object_array_add(struct json_object *obj,
* @param idx the index to insert the element at
* @param val the json_object to be added
*/
extern int json_object_array_put_idx(struct json_object *obj, int idx,
extern int json_object_array_put_idx(struct json_object *obj, size_t idx,
struct json_object *val);
/** Get the element at specificed index of the array (a json_object of type json_type_array)
@@ -524,7 +524,7 @@ extern int json_object_array_put_idx(struct json_object *obj, int idx,
* @returns the json_object at the specified index (or NULL)
*/
extern struct json_object* json_object_array_get_idx(const struct json_object *obj,
int idx);
size_t idx);
/** Delete an elements from a specified index in an array (a json_object of type json_type_array)
*