mirror/json-c
1
0
Fork 0
mirror of https://github.com/json-c/json-c.git synced 2026-03-27 17:09:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Create a json_pointer_private.h and move a few things there, fix test warnings, note array_list_insert_idx is private.

Browse Source
This commit is contained in:
Eric Hawicz
2023-07-16 10:48:20 -04:00
parent 3b8363fcdc
commit efc530594b
8 changed files with 56 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
json_patch.c
View File

@@ -14,6 +14,7 @@
#include "json_patch.h"
#include "json_object_private.h"
#include "json_pointer_private.h"
/**
* JavaScript Object Notation (JSON) Patch
@@ -193,7 +194,7 @@ static int json_patch_apply_move_copy(struct json_object **res,
int json_patch_apply(struct json_object *base, struct json_object *patch,
struct json_object **res)
{
size_t i;
size_t ii;
int rc = 0;
if (!base || !json_object_is_type(patch, json_type_array)) {
@@ -206,9 +207,9 @@ int json_patch_apply(struct json_object *base, struct json_object *patch,
return -1;
/* Go through all operations ; apply them on res */
for (i = 0; i < json_object_array_length(patch); i++) {
for (ii = 0; ii < json_object_array_length(patch); ii++) {
struct json_object *jop, *jpath;
struct json_object *patch_elem = json_object_array_get_idx(patch, i);
struct json_object *patch_elem = json_object_array_get_idx(patch, ii);
const char *op, *path;
if (!json_object_object_get_ex(patch_elem, "op", &jop)) {
errno = EINVAL;