mirror/cJSON
1
0
Fork 0
mirror of https://github.com/DaveGamble/cJSON.git synced 2023-08-10 21:13:26 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #503 from Alanscut/issue499

Browse Source 
optimize the way to find tail node
This commit is contained in:
Alan Wang 2020-09-03 11:51:54 +08:00 committed by GitHub
commit 2e5171d8d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cJSON.c
View File

@ -1975,15 +1975,6 @@ static cJSON_bool add_item_to_array(cJSON *array, cJSON *item)
suffix_object(child->prev, item); suffix_object(child->prev, item);
array->child->prev = item; array->child->prev = item;
} }
else
{
while (child->next)
{
child = child->next;
}
suffix_object(child, item);
array->child->prev = item;
}
} }
return true; return true;
@ -2571,6 +2562,7 @@ CJSON_PUBLIC(cJSON *) cJSON_CreateIntArray(const int *numbers, int count)
} }
p = n; p = n;
} }
a->child->prev = n;
return a; return a;
} }
@ -2607,6 +2599,7 @@ CJSON_PUBLIC(cJSON *) cJSON_CreateFloatArray(const float *numbers, int count)
} }
p = n; p = n;
} }
a->child->prev = n;
return a; return a;
} }
@ -2643,6 +2636,7 @@ CJSON_PUBLIC(cJSON *) cJSON_CreateDoubleArray(const double *numbers, int count)
} }
p = n; p = n;
} }
a->child->prev = n;
return a; return a;
} }
@ -2679,6 +2673,7 @@ CJSON_PUBLIC(cJSON *) cJSON_CreateStringArray(const char *const *strings, int co
} }
p = n; p = n;
} }
a->child->prev = n;
return a; return a;
} }
@ -2751,6 +2746,10 @@ CJSON_PUBLIC(cJSON *) cJSON_Duplicate(const cJSON *item, cJSON_bool recurse)
} }
child = child->next; child = child->next;
} }
if (newitem && newitem->child)
{
newitem->child->prev = newchild;
}
return newitem; return newitem;

8
cJSON_Utils.c
View File

@ -403,7 +403,7 @@ static cJSON *detach_item_from_array(cJSON *array, size_t which)
/* item doesn't exist */ /* item doesn't exist */
return NULL; return NULL;
} }
if (c->prev) if (c != array->child)
{ {
/* not the first element */ /* not the first element */
c->prev->next = c->next; c->prev->next = c->next;
@ -412,10 +412,14 @@ static cJSON *detach_item_from_array(cJSON *array, size_t which)
{ {
c->next->prev = c->prev; c->next->prev = c->prev;
} }
if (c==array->child) if (c == array->child)
{ {
array->child = c->next; array->child = c->next;
} }
else if (c->next == NULL)
{
array->child->prev = c->prev;
}
/* make sure the detached item doesn't point anywhere anymore */ /* make sure the detached item doesn't point anywhere anymore */
c->prev = c->next = NULL; c->prev = c->next = NULL;