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

patch to optimise array/object printing.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/cjson/code@60 e3330c51-1366-4df0-8b21-3ccf24e3d50e
This commit is contained in:
Dave Gamble 2015-02-09 17:28:26 +00:00
parent 575724a15f
commit 70984d47e9
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cJSON.c
View File

@ -383,6 +383,7 @@ static char *print_array(cJSON *item,int depth,int fmt)
char *out=0,*ptr,*ret;int len=5; char *out=0,*ptr,*ret;int len=5;
cJSON *child=item->child; cJSON *child=item->child;
int numentries=0,i=0,fail=0; int numentries=0,i=0,fail=0;
size_t tmplen=0;
/* How many entries in the array? */ /* How many entries in the array? */
while (child) numentries++,child=child->next; while (child) numentries++,child=child->next;
@ -425,7 +426,7 @@ static char *print_array(cJSON *item,int depth,int fmt)
ptr=out+1;*ptr=0; ptr=out+1;*ptr=0;
for (i=0;i<numentries;i++) for (i=0;i<numentries;i++)
{ {
strcpy(ptr,entries[i]);ptr+=strlen(entries[i]); tmplen=strlen(entries[i]);memcpy(ptr,entries[i],tmplen);ptr+=tmplen;
if (i!=numentries-1) {*ptr++=',';if(fmt)*ptr++=' ';*ptr=0;} if (i!=numentries-1) {*ptr++=',';if(fmt)*ptr++=' ';*ptr=0;}
cJSON_free(entries[i]); cJSON_free(entries[i]);
} }
@ -477,6 +478,7 @@ static char *print_object(cJSON *item,int depth,int fmt)
char *out=0,*ptr,*ret,*str;int len=7,i=0,j; char *out=0,*ptr,*ret,*str;int len=7,i=0,j;
cJSON *child=item->child; cJSON *child=item->child;
int numentries=0,fail=0; int numentries=0,fail=0;
size_t tmplen=0;
/* Count the number of entries. */ /* Count the number of entries. */
while (child) numentries++,child=child->next; while (child) numentries++,child=child->next;
/* Explicitly handle empty object case */ /* Explicitly handle empty object case */
@ -524,7 +526,7 @@ static char *print_object(cJSON *item,int depth,int fmt)
for (i=0;i<numentries;i++) for (i=0;i<numentries;i++)
{ {
if (fmt) for (j=0;j<depth;j++) *ptr++='\t'; if (fmt) for (j=0;j<depth;j++) *ptr++='\t';
strcpy(ptr,names[i]);ptr+=strlen(names[i]); tmplen=strlen(names[i]);memcpy(ptr,names[i],tmplen);ptr+=tmplen;
*ptr++=':';if (fmt) *ptr++='\t'; *ptr++=':';if (fmt) *ptr++='\t';
strcpy(ptr,entries[i]);ptr+=strlen(entries[i]); strcpy(ptr,entries[i]);ptr+=strlen(entries[i]);
if (i!=numentries-1) *ptr++=','; if (i!=numentries-1) *ptr++=',';