Use 'size_t' for JSON object/array's size.

Author: Barenboim

README.md

@@ -68,7 +68,7 @@ json_array_t *json_value_array(const json_value_t *val);
 ~~~c
 /* Get the size of the JSON object.
    @obj: JSON object */
-int json_object_size(const json_object_t *obj);
+size_t json_object_size(const json_object_t *obj);
 
 /* Find the JSON value under the key @name. Returns NULL if @name
    can not be found. The time complexity of this function is
@@ -91,7 +91,7 @@ json_object_for_each_prev(name, val, obj)
 ~~~c
 /* Get the size of the JSON array.
    @arr：JSON array */
-int json_array_size(const json_array_t *arr);
+size_t json_array_size(const json_array_t *arr);
 
 /* Traversing the JSON array forward or backward
    @val: Temporary (const json_value_t *) pointer for each JSON value

README_cn.md

@@ -60,7 +60,7 @@ json_array_t *json_value_array(const json_value_t *val);
 ~~~c
 /* 返回object的大小。即object包含的name，value对数量
    @obj：JSON object对象 */
-int json_object_size(const json_object_t *obj);
+size_t json_object_size(const json_object_t *obj);
 
 /* 查找并返回name下的value。返回NULL代表找不到这个name。函数时间复杂度为O(log(size))
    @name：要查找的名字
@@ -80,7 +80,7 @@ json_object_for_each_prev(name, val, obj)
 ~~~c
 /* 返回JSON array的大小，即元素个数
    @arr：JSON array对象 */
-int json_array_size(const json_array_t *arr);
+size_t json_array_size(const json_array_t *arr);
 
 /* 向前或向后遍历JSON array
    @val：临时的const json_value_t *类型的JSON value对象

json_parser.c

@@ -12,13 +12,13 @@
 struct __json_object
 {
 	struct list_head head;
-	int size;
+	size_t size;
 };
 
 struct __json_array
 {
 	struct list_head head;
-	int size;
+	size_t size;
 };
 
 struct __json_value
@@ -481,7 +481,6 @@ static int __parse_json_members(const char *cursor, const char **end,
 								int depth, json_object_t *obj)
 {
 	json_member_t *memb;
-	int cnt = 0;
 	size_t len;
 	int ret;
 
@@ -516,7 +515,7 @@ static int __parse_json_members(const char *cursor, const char **end,
 		}
 
 		list_add_tail(&memb->list, &obj->head);
-		cnt++;
+		obj->size++;
 
 		while (isspace(*cursor))
 			cursor++;
@@ -534,7 +533,7 @@ static int __parse_json_members(const char *cursor, const char **end,
 	}
 
 	*end = cursor + 1;
-	return cnt;
+	return 0;
 }
 
 static void __destroy_json_members(json_object_t *obj)
@@ -559,22 +558,21 @@ static int __parse_json_object(const char *cursor, const char **end,
 		return -3;
 
 	INIT_LIST_HEAD(&obj->head);
+	obj->size = 0;
 	ret = __parse_json_members(cursor, end, depth + 1, obj);
 	if (ret < 0)
 	{
 		__destroy_json_members(obj);
 		return ret;
 	}
 
-	obj->size = ret;
 	return 0;
 }
 
 static int __parse_json_elements(const char *cursor, const char **end,
 								 int depth, json_array_t *arr)
 {
 	json_element_t *elem;
-	int cnt = 0;
 	int ret;
 
 	while (isspace(*cursor))
@@ -600,7 +598,7 @@ static int __parse_json_elements(const char *cursor, const char **end,
 		}
 
 		list_add_tail(&elem->list, &arr->head);
-		cnt++;
+		arr->size++;
 
 		while (isspace(*cursor))
 			cursor++;
@@ -618,7 +616,7 @@ static int __parse_json_elements(const char *cursor, const char **end,
 	}
 
 	*end = cursor + 1;
-	return cnt;
+	return 0;
 }
 
 static void __destroy_json_elements(json_array_t *arr)
@@ -643,14 +641,14 @@ static int __parse_json_array(const char *cursor, const char **end,
 		return -3;
 
 	INIT_LIST_HEAD(&arr->head);
+	arr->size = 0;
 	ret = __parse_json_elements(cursor, end, depth + 1, arr);
 	if (ret < 0)
 	{
 		__destroy_json_elements(arr);
 		return ret;
 	}
 
-	arr->size = ret;
 	return 0;
 }
 
@@ -913,9 +911,10 @@ static int __copy_json_members(const json_object_t *src, json_object_t *dest)
 
 		memcpy(memb->name, entry->name, len + 1);
 		list_add_tail(&memb->list, &dest->head);
+		dest->size++;
 	}
 
-	return src->size;
+	return 0;
 }
 
 static int __copy_json_elements(const json_array_t *src, json_array_t *dest)
@@ -940,9 +939,10 @@ static int __copy_json_elements(const json_array_t *src, json_array_t *dest)
 		}
 
 		list_add_tail(&elem->list, &dest->head);
+		dest->size++;
 	}
 
-	return src->size;
+	return 0;
 }
 
 static int __copy_json_value(const json_value_t *src, json_value_t *dest)
@@ -967,26 +967,26 @@ static int __copy_json_value(const json_value_t *src, json_value_t *dest)
 
 	case JSON_VALUE_OBJECT:
 		INIT_LIST_HEAD(&dest->value.object.head);
+		dest->value.object.size = 0;
 		ret = __copy_json_members(&src->value.object, &dest->value.object);
 		if (ret < 0)
 		{
 			__destroy_json_members(&dest->value.object);
 			return ret;
 		}
 
-		dest->value.object.size = ret;
 		break;
 
 	case JSON_VALUE_ARRAY:
 		INIT_LIST_HEAD(&dest->value.array.head);
+		dest->value.array.size = 0;
 		ret = __copy_json_elements(&src->value.array, &dest->value.array);
 		if (ret < 0)
 		{
 			__destroy_json_elements(&dest->value.array);
 			return ret;
 		}
 
-		dest->value.array.size = ret;
 		break;
 	}
 
@@ -1002,13 +1002,11 @@ json_value_t *json_value_copy(const json_value_t *val)
 	if (!copy)
 		return NULL;
 
-	if (__copy_json_value(val, copy) < 0)
-	{
-		free(copy);
-		return NULL;
-	}
+	if (__copy_json_value(val, copy) >= 0)
+		return copy;
 
-	return copy;
+	free(copy);
+	return NULL;
 }
 
 void json_value_destroy(json_value_t *val)
@@ -1070,7 +1068,7 @@ const json_value_t *json_object_find(const char *name,
 	return NULL;
 }
 
-int json_object_size(const json_object_t *obj)
+size_t json_object_size(const json_object_t *obj)
 {
 	return obj->size;
 }
@@ -1238,7 +1236,7 @@ json_value_t *json_object_remove(const json_value_t *val,
 	return (json_value_t *)val;
 }
 
-int json_array_size(const json_array_t *arr)
+size_t json_array_size(const json_array_t *arr)
 {
 	return arr->size;
 }

json_parser.h

@@ -33,7 +33,7 @@ json_array_t *json_value_array(const json_value_t *val);
 
 const json_value_t *json_object_find(const char *name,
 									 const json_object_t *obj);
-int json_object_size(const json_object_t *obj);
+size_t json_object_size(const json_object_t *obj);
 const char *json_object_next_name(const char *name,
 								  const json_object_t *obj);
 const json_value_t *json_object_next_value(const json_value_t *val,
@@ -58,7 +58,7 @@ const json_value_t *json_object_insert_before(const json_value_t *val,
 json_value_t *json_object_remove(const json_value_t *val,
 								 json_object_t *obj);
 
-int json_array_size(const json_array_t *arr);
+size_t json_array_size(const json_array_t *arr);
 const json_value_t *json_array_next_value(const json_value_t *val,
 										  const json_array_t *arr);
 const json_value_t *json_array_prev_value(const json_value_t *val,