Add removing value functions.

Barenboim · Nov 29, 2022 · 376cead · 376cead
1 parent a879ed0
commit 376cead
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 0 deletions.
diff --git a/json_parser.c b/json_parser.c
@@ -845,6 +845,24 @@ const json_value_t *json_object_append(json_object_t *obj,
 	return &memb->value;
 }
 
+json_value_t *json_object_remove(const json_value_t *val,
+								 json_object_t *obj)
+{
+	json_member_t *memb = list_entry(val, json_member_t, value);
+
+	val = (json_value_t *)malloc(sizeof (json_value_t));
+	if (!val)
+		return NULL;
+
+	list_del(&memb->list);
+	rb_erase(&memb->rb, &obj->root);
+	obj->size--;
+
+	__move_json_value(&memb->value, (json_value_t *)val);
+	free(memb);
+	return (json_value_t *)val;
+}
+
 int json_array_size(const json_array_t *arr)
 {
 	return arr->size;
@@ -896,3 +914,20 @@ const json_value_t *json_array_append(json_array_t *arr,
 	return &elem->value;
 }
 
+json_value_t *json_array_remove(const json_value_t *val,
+								json_array_t *arr)
+{
+	json_element_t *elem = list_entry(val, json_element_t, value);
+
+	val = (json_value_t *)malloc(sizeof (json_value_t));
+	if (!val)
+		return NULL;
+
+	list_del(&elem->list);
+	arr->size--;
+
+	__move_json_value(&elem->value, (json_value_t *)val);
+	free(elem);
+	return (json_value_t *)val;
+}
+
diff --git a/json_parser.h b/json_parser.h
@@ -40,12 +40,16 @@ const json_value_t *json_object_next_value(const json_value_t *prev,
 const json_value_t *json_object_append(json_object_t *obj,
 									   const char *name,
 									   int type, ...);
+json_value_t *json_object_remove(const json_value_t *val,
+								 json_object_t *obj);
 
 int 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_append(json_array_t *arry,
 									  int type, ...);
+json_value_t *json_array_remove(const json_value_t *val,
+								json_array_t *arr);
 
 #ifdef __cplusplus
 }