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
895 Commits 11 Branches 46 Tags 3.5 MiB
be749d7efa
Commit Graph

895 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kevin Branigan
affedd65ba Merge pull request #11 from etodd/win-math-lib-fix 
Remove "m" library dependency on Windows.
 2015-08-20 12:35:07 -04:00
Evan Todd
ebd06067a4 Remove "m" library dependency on Windows. 2015-08-19 23:03:08 -04:00
Kevin Branigan
a819694712 Merge pull request #10 from ajaybhargav/master 
Update gitignore to avoid tracking unwanted files
 2015-08-12 11:10:06 -04:00
Ajay Bhargav
acff70b22d Update gitignore to avoid tracking unwanted files 
.gitignore updated to avoid tracking files generated after build. Following list
of files are added:
*.o
*.a
*.so
*.swp
*.patch
tags

Signed-off-by: Ajay Bhargav <ajay.bhargav@einfochips.com>
 2015-08-12 12:53:33 +05:30
Kevin Branigan
f86b9bdfcf Merge pull request #9 from anton-sergeev/master 
Merge latest upstream code (svn rev. 73) into github fork
 2015-07-27 21:33:42 -04:00
Anton Sergeev
956129116f Support cJSON_Utils library in CMakeLists.txt 
Signed-off-by: Anton Sergeev <Anton.Sergeev@elecard.ru>
 2015-07-28 03:48:28 +06:00
Anton Sergeev
74793934ad Merge latest upstream code (r73) into github fork. 
Signed-off-by: Anton Sergeev <Anton.Sergeev@elecard.ru>

Conflicts:
	cJSON.c
	test.c
 2015-07-28 03:48:06 +06:00
Kevin Branigan
2bd1e80f6c Merge pull request #8 from anton-sergeev/master 
Add CMakeLists.txt
 2015-07-15 10:34:08 -04:00
Anton Sergeev
262189428e Add CMakeLists.txt 
Signed-off-by: Anton Sergeev <Anton.Sergeev@elecard.ru>
 2015-07-15 14:08:45 +06:00
Kevin Branigan
7632993ebe Merge pull request #7 from DongwenHuang/master 
Update cJSON.c
 2015-06-15 10:59:20 -04:00
DongwenHuang
10b888be54 Update cJSON.c 2015-06-15 17:13:22 +08:00
Kevin Branigan
0fd1435f4b Merge pull request #6 from DongwenHuang/master 
Update test.c
 2015-06-12 14:25:52 -04:00
DongwenHuang
4132e9301d Update test.c 2015-06-12 12:44:42 +08:00
Dave Gamble
8004ed3115 Fix bug with the sort. 
git-svn-id: svn://svn.code.sf.net/p/cjson/code@73 e3330c51-1366-4df0-8b21-3ccf24e3d50e
 2015-02-13 20:33:06 +00:00
Dave Gamble
174c62902c Since we anticipate repeated comparisons, add in a test for sorted lists, which can reduce 
cost for sorted objects to O(N)


git-svn-id: svn://svn.code.sf.net/p/cjson/code@72 e3330c51-1366-4df0-8b21-3ccf24e3d50e
 2015-02-13 20:31:33 +00:00
Dave Gamble
491cf029b2 Rework cJSON_Utils object compare functions to use an O(N) algorithm on sorted lists. 
It's a bit of a shame to use the sorts, because cJSON is otherwise incredibly stable (json->cJSON->json is unmodified modulo formatting),
but it means we get usable performance, rather than O(N^2) which will make CPUs cry.


git-svn-id: svn://svn.code.sf.net/p/cjson/code@71 e3330c51-1366-4df0-8b21-3ccf24e3d50e
 2015-02-13 19:53:27 +00:00
Dave Gamble
c4ddd7aaa3 Correct comment and variable declaration style to be more compatible. Added cJSONUtils_SortObject for sorting the members of an object alphabetically. 
git-svn-id: svn://svn.code.sf.net/p/cjson/code@70 e3330c51-1366-4df0-8b21-3ccf24e3d50e
 2015-02-13 19:19:26 +00:00
Dave Gamble
1d9b70e706 Fix comment style for proper ansi c compliance. 
git-svn-id: svn://svn.code.sf.net/p/cjson/code@69 e3330c51-1366-4df0-8b21-3ccf24e3d50e
 2015-02-13 19:07:29 +00:00
Dave Gamble
9d0a4cbf2a adjust the test very slightly 
git-svn-id: svn://svn.code.sf.net/p/cjson/code@68 e3330c51-1366-4df0-8b21-3ccf24e3d50e
 2015-02-11 11:34:01 +00:00
Dave Gamble
b44a338c6d Optimise out escapable array. 
git-svn-id: svn://svn.code.sf.net/p/cjson/code@67 e3330c51-1366-4df0-8b21-3ccf24e3d50e
 2015-02-11 11:31:35 +00:00
Dave Gamble
060e6563c0 Add more patch functionality and some more utils. 
Also add a new #define to cJSON.h for SetNumberValue.


git-svn-id: svn://svn.code.sf.net/p/cjson/code@66 e3330c51-1366-4df0-8b21-3ccf24e3d50e
 2015-02-11 01:29:40 +00:00
Dave Gamble
3c6b3cc617 start of JSON Patch implementation. cJSON gained a cJSON_InsertItemToArray which pushes elements up by one. 
This is needed for JSON Patch. Everything but Test is implemented for ApplyPatches.


git-svn-id: svn://svn.code.sf.net/p/cjson/code@65 e3330c51-1366-4df0-8b21-3ccf24e3d50e
 2015-02-10 14:17:59 +00:00
Dave Gamble
858671cc7f rework cJSONUtils_GetPointer to avoid malloc/free by using strcmp with pointer-encoding awareness. 
git-svn-id: svn://svn.code.sf.net/p/cjson/code@64 e3330c51-1366-4df0-8b21-3ccf24e3d50e
 2015-02-10 12:14:59 +00:00
Dave Gamble
c0f5e2056b add cJSON_Utils which includes JSON Pointer implementation 
git-svn-id: svn://svn.code.sf.net/p/cjson/code@63 e3330c51-1366-4df0-8b21-3ccf24e3d50e
 2015-02-09 18:29:05 +00:00
Dave Gamble
2abfb716d1 fix formatting. 
git-svn-id: svn://svn.code.sf.net/p/cjson/code@62 e3330c51-1366-4df0-8b21-3ccf24e3d50e
 2015-02-09 17:38:18 +00:00
Dave Gamble
d9fc81e6c8 Added buffered printing methods for faster printing. 
git-svn-id: svn://svn.code.sf.net/p/cjson/code@61 e3330c51-1366-4df0-8b21-3ccf24e3d50e
 2015-02-09 17:34:35 +00:00
Dave Gamble
70984d47e9 patch to optimise array/object printing. 
git-svn-id: svn://svn.code.sf.net/p/cjson/code@60 e3330c51-1366-4df0-8b21-3ccf24e3d50e
 2015-02-09 17:28:26 +00:00
Dave Gamble
575724a15f optimises for number/string print 
git-svn-id: svn://svn.code.sf.net/p/cjson/code@59 e3330c51-1366-4df0-8b21-3ccf24e3d50e
 2015-02-09 17:25:55 +00:00
Kevin Branigan
2ffefcec73 Merge pull request #4 from rafaeldias/master 
Fixed issue with ansi (single-line comments) and updated Makefile for compiling dynamic and static lib.
 2015-02-03 00:31:11 -05:00
Rafael Leal Dias
a3eafd540d Fixed issue withh ansi (single-line comments) and updated Makefile for compiling dynamic and static lib. 2015-01-30 12:06:14 -02:00
Kevin Branigan
65478ea731 Merge pull request #1 from pontillo/master 
Merge latest upstream code into github fork
 2014-05-21 11:26:06 -04:00
Mike Pontillo
cf50682983 Merge latest upstream code into github fork. 
Conflicts:
	cJSON.c
	cJSON.h
	test.c
 2014-05-20 20:03:20 -07:00
Dave Gamble
28691956a6 fix \u parser 
git-svn-id: http://svn.code.sf.net/p/cjson/code@58 e3330c51-1366-4df0-8b21-3ccf24e3d50e
 2013-08-19 14:49:06 +00:00
Dave Gamble
c537515c17 inbuilt hex parser for unicode, which ought to be a lot faster. 
git-svn-id: http://svn.code.sf.net/p/cjson/code@57 e3330c51-1366-4df0-8b21-3ccf24e3d50e
 2013-08-14 13:20:42 +00:00
Dave Gamble
22e51c92f0 license file separated out :) 
git-svn-id: http://svn.code.sf.net/p/cjson/code@56 e3330c51-1366-4df0-8b21-3ccf24e3d50e
 2013-08-14 13:16:18 +00:00
Dave Gamble
73cc8dd1c4 cJSON_Minify (which strips comments), 
fixed buffer overflow
const * for array creates


git-svn-id: http://svn.code.sf.net/p/cjson/code@55 e3330c51-1366-4df0-8b21-3ccf24e3d50e
 2013-08-14 12:58:13 +00:00
Dave Gamble
46e3724aa8 clean up test.c 
git-svn-id: http://svn.code.sf.net/p/cjson/code@54 e3330c51-1366-4df0-8b21-3ccf24e3d50e
 2013-02-09 12:57:04 +00:00
Dave Gamble
15adf71272 Tidy comments. Add cJSON_SetIntValue. 
git-svn-id: http://svn.code.sf.net/p/cjson/code@53 e3330c51-1366-4df0-8b21-3ccf24e3d50e
 2013-02-09 12:56:01 +00:00
Dave Gamble
2c9474e9e3 fix non-explicit cast 
git-svn-id: http://svn.code.sf.net/p/cjson/code@52 e3330c51-1366-4df0-8b21-3ccf24e3d50e
 2013-02-09 12:55:11 +00:00
Dave Gamble
02a1e544f7 add cJSON_AddBoolToObject(). 
git-svn-id: http://svn.code.sf.net/p/cjson/code@51 e3330c51-1366-4df0-8b21-3ccf24e3d50e
 2013-02-06 12:59:21 +00:00
Dave Gamble
96c59f3e49 Wire in ParseWithOpts to allow detection of JSON with following garbage. 
git-svn-id: http://svn.code.sf.net/p/cjson/code@50 e3330c51-1366-4df0-8b21-3ccf24e3d50e
 2013-02-06 12:44:17 +00:00
Dave Gamble
d755436ba7 tests for cJSON_Duplicate, so it will fail by returning 0 if anything fails to allocate 
git-svn-id: http://svn.code.sf.net/p/cjson/code@49 e3330c51-1366-4df0-8b21-3ccf24e3d50e
 2013-02-05 18:26:51 +00:00
Dave Gamble
927aa631b8 Added cJSON_Duplicate. With commentary 
git-svn-id: http://svn.code.sf.net/p/cjson/code@48 e3330c51-1366-4df0-8b21-3ccf24e3d50e
 2013-02-05 18:23:22 +00:00
Dave Gamble
a7fe08778f bracket logic (to quiet a warning). 
Fix for potential buffer overflow printing extremely large integers.


git-svn-id: http://svn.code.sf.net/p/cjson/code@47 e3330c51-1366-4df0-8b21-3ccf24e3d50e
 2013-02-05 17:42:42 +00:00
Dave Gamble
8c60f99c72 fix handling of utf16 surrogate pairs! 
git-svn-id: http://svn.code.sf.net/p/cjson/code@46 e3330c51-1366-4df0-8b21-3ccf24e3d50e
 2013-02-05 17:38:48 +00:00
Dave Gamble
8aa084918f Revert last patch. Simpler fix for empty arrays/objects is to handle them explicitly and then bail. 
Saves plenty of unnecessary state-tracking.


git-svn-id: http://svn.code.sf.net/p/cjson/code@45 e3330c51-1366-4df0-8b21-3ccf24e3d50e
 2013-02-05 17:27:59 +00:00
Dave Gamble
3ddf3a5911 stable solution for printing arrays - based on patch donated by Jerome Lang. 
Resolves issue in case malloc(0)!=0.



git-svn-id: http://svn.code.sf.net/p/cjson/code@44 e3330c51-1366-4df0-8b21-3ccf24e3d50e
 2013-02-05 17:14:12 +00:00
Dave Gamble
4678f33b5c Fix up ANSI issues. 
git-svn-id: http://svn.code.sf.net/p/cjson/code@43 e3330c51-1366-4df0-8b21-3ccf24e3d50e
 2013-02-05 17:00:31 +00:00
Dave Gamble
fd1ac4f179 make parse_number more robust! 
git-svn-id: http://svn.code.sf.net/p/cjson/code@42 e3330c51-1366-4df0-8b21-3ccf24e3d50e
 2011-10-10 15:33:19 +00:00
Dave Gamble
0d268cfef7 Update to cJSON! We now support UTF-16 surrogate pairs :) 
git-svn-id: http://svn.code.sf.net/p/cjson/code@41 e3330c51-1366-4df0-8b21-3ccf24e3d50e
 2011-10-10 15:22:34 +00:00