From: Daniel M. Weeks <dan@danweeks.net>
Date: Fri, 22 Aug 2014 16:16:45 +0000 (-0400)
Subject: Use size_t for json object array ops
X-Git-Tag: json-c-0.13-20171207~164^2~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F210%2Fhead;p=thirdparty%2Fjson-c.git

Use size_t for json object array ops
---

diff --git a/json_object.c b/json_object.c
index 9ac22a30..8e7e8a1b 100644
--- a/json_object.c
+++ b/json_object.c
@@ -868,7 +868,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");
@@ -959,7 +959,7 @@ struct json_object* json_object_array_bsearch(
 	return *result;
 }
 
-int json_object_array_length(struct json_object *jso)
+size_t json_object_array_length(struct json_object *jso)
 {
 	return array_list_length(jso->o.c_array);
 }
@@ -969,14 +969,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(struct json_object *jso,
-					      int idx)
+					      size_t idx)
 {
 	return (struct json_object*)array_list_get_idx(jso->o.c_array, idx);
 }
diff --git a/json_object.h b/json_object.h
index 67137d87..f8106781 100644
--- a/json_object.h
+++ b/json_object.h
@@ -449,7 +449,7 @@ extern struct array_list* json_object_get_array(struct json_object *obj);
  * @param obj the json_object instance
  * @returns an int
  */
-extern int json_object_array_length(struct json_object *obj);
+extern size_t json_object_array_length(struct json_object *obj);
 
 /** Sorts the elements of jso of type json_type_array
 *
@@ -507,7 +507,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)
@@ -516,7 +516,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(struct json_object *obj,
-						     int idx);
+						     size_t idx);
 
 /* json_bool type methods */