RepoMirrors
/
cJSON
mirror of https://github.com/DaveGamble/cJSON
1
0
Fork 0
Code Issues Releases Wiki Activity
353 Commits 11 Branches 47 Tags 6.8 MiB
Commit Graph

353 Commits

Author SHA1 Message Date
Max Bruckner 0d6ccf032d CMake: Change library names to all lowercase 
Library names:
libcJSON -> libcjson
libcJSON_utils -> libcjson_utils
 2016-11-14 19:14:08 +07:00
Max Bruckner 34361dbb9b CMake: Reformat 2016-11-14 19:14:08 +07:00
Max Bruckner 81e95718d5 CMake: Regroup lines 2016-11-14 19:14:07 +07:00
Max Bruckner 9a4657fbee CMake: Set version and soversion 2016-11-14 19:14:07 +07:00
Max Bruckner 8a46cb7b55 gitignore: ignore build directory 2016-11-14 19:14:07 +07:00
Jiri Zouhar 06008b0444 add support to insert raw json 2016-11-14 11:20:10 +01:00
Max Bruckner 0d10e279c8 fix #55 memory leak in cJSON_ReplaceItemInObject 2016-11-11 11:53:14 +07:00
Max Bruckner 9e31049159 test and test_utils: Make compliant with ANSI C 2016-11-08 00:57:58 +07:00
Max Bruckner 8ac1ba416e test: Fix unescaped quote 2016-11-08 00:57:57 +07:00
Max Bruckner 25b65feb36 Remove old readme. It was replaced by README.md 2016-11-08 00:57:57 +07:00
Max Bruckner 1dff6f160f cJSON_Utils: own strdup for C89 compatibility 2016-11-08 00:57:57 +07:00
Max Bruckner a148520ffb Revert "Fix #26: Use long double literal for 1e60" 
This reverts commit 3ea491c0a6.
 2016-11-08 00:53:16 +07:00
Max Bruckner b4d728d018 pow2gt: Detect integer size fix #27 2016-11-07 20:09:58 +07:00
Max Bruckner 3ea491c0a6 Fix #26: Use long double literal for 1e60 
Big thanks at mvollmer (https://sourceforge.net/p/cjson/bugs/45/)
 2016-11-05 21:26:18 +07:00
Max Bruckner 050829f274 Merge pull request #50 from ffontaine/master 
Do not always build static and dynamic
 2016-11-04 08:23:08 +07:00
Max Bruckner 4d06882c68 Merge pull request #44 from iMobs/arm_compilation 
ARM Compilation
 2016-11-01 08:42:45 +07:00
Max Bruckner b355733aa1 Merge pull request #43 from rvagg/malloc-err 
don't ignore malloc failure in cJSON_PrintBuffered
 2016-10-31 08:19:08 +07:00
Rod Vagg 5323f558cd don't ignore malloc failure in cJSON_PrintBuffered 2016-10-31 10:54:34 +11:00
Fabrice Fontaine 8e799362ca Do not always build static and dynamic 
Currently, the static and dynamic version of the libraries are always
built as add_library is called twice. Instead, this patch will use the
standard CMake variable BUILD_SHARED_LIBS to know if the static or the
dynamic version must be built.

Signed-off-by: Fabrice Fontaine <fabrice.fontaine@orange.com>
 2016-10-29 20:30:28 +02:00
Max Bruckner a1c022fef6 Merge pull request #37 from DaveGamble/reformatting 
Reformat cJSON_Utils.c and test.c
 2016-10-29 22:52:55 +07:00
Max Bruckner ddeca82718 reformatting: cJSON.c: fix indentation 2016-10-29 22:44:45 +07:00
Max Bruckner c0b17dc651 reformatting: cJSONUtils_GenerateMergePatch 2016-10-29 22:44:45 +07:00
Max Bruckner 01a813f642 reformatting: cJSONUtils_MergePatch 2016-10-29 22:44:45 +07:00
Max Bruckner c65514fcb4 reformatting: cJSONUtils_SortObject 2016-10-29 22:44:44 +07:00
Max Bruckner 8964287ec4 reformatting: cJSONUtils_SortList 2016-10-29 22:44:44 +07:00
Max Bruckner ec9d1cfedb reformatting: cJSONUtils_GeneratePatches 2016-10-29 22:44:44 +07:00
Max Bruckner 8879ed5dbc reformatting: cJSONUtils_CompareToPatch 2016-10-29 22:44:44 +07:00
Max Bruckner 52e53acfc3 reformatting: cJSON_AddPatchToArray 2016-10-29 22:44:43 +07:00
Max Bruckner d6a6abeca0 reformatting: cJSONUtils_GeneratePatch 2016-10-29 22:44:43 +07:00
Max Bruckner e8a67f0e4b reformatting: cJSONUtils_ApplyPatches 2016-10-29 22:44:43 +07:00
Max Bruckner d883f9b9b0 reformatting: cJSONUtils_ApplyPatch 2016-10-29 22:44:43 +07:00
Max Bruckner 284a8017b7 reformatting: cJSONUtils_Compare 2016-10-29 22:44:43 +07:00
Max Bruckner 1235c62235 reformatting: cJSONUtils_PatchDetach 2016-10-29 22:44:42 +07:00
Max Bruckner a21a124d40 reformatting: cJSONUtils_InplaceDecodePointerString 2016-10-29 22:44:42 +07:00
Max Bruckner 5713edb710 reformatting: cJSON_Utils_GetPointer 
NOTE: This can change the assembly slightly, in my case it reordered two
instructions. This is due to the change from:

    which = (10 * which) + *pointer++ - '0';

to

    which = (10 * which) + (*pointer++ - '0');

This means that after the change, the subtraction runs before the
addition instead of after that. That shouldn't change the behavior
though.
 2016-10-29 22:42:04 +07:00
Max Bruckner 0c23e8dde0 Merge pull request #40 from jfether/patch-1 
Remove redundant test from cJSON_AddItemToArray
 2016-10-28 14:06:39 +07:00
Jonathan Fether 9f00ff9a91 Remove redundant test from cJSON_AddItemToArray 
The test for whether "c" is null is redundant.  Since this is the else case of "(!c)", and the only way "c" is changed is by the instruction assigning it "c->next" on the condition here, simply verifying that "c->next" isn't null is sufficient.
 2016-10-27 20:02:44 -07:00
Ian Mobley d4836effc9 Fix compiler warning "array subscript has type char" when using arm-none-eabi-gcc 2016-10-17 17:20:57 -07:00
Max Bruckner 158ddceab3 reformatting: cJSONUtils_FindPointerFromObjectTo 2016-10-14 00:05:58 +07:00
Max Bruckner c6cb991e3f reformatting: cJSON.h: remove trailing spaces 2016-10-13 23:48:53 +07:00
Max Bruckner 7771225e35 reformatting: cJSONUtils_PointerEncodedstrcpy 2016-10-13 23:47:40 +07:00
Max Bruckner 3f6716e63a reformatting: cJSONUtils_PointerEncodedstrlen 2016-10-13 23:42:34 +07:00
Max Bruckner 2f002879c0 reformatting: cJSONUtils_Pstrcasecmp 2016-10-13 23:40:02 +07:00
Max Bruckner cb6445f47b reformatting: cJSON_strcasecmp 2016-10-13 23:26:53 +07:00
Max Bruckner 526d6b1312 reformatting: cJSON_Utils.h 2016-10-13 00:18:44 +07:00
Ian Mobley 85aa59be38 Use $(AR) environment variable with libcjson.a 
Allow for alternative archive tool when using make.
 2016-10-10 13:13:06 -07:00
Max Bruckner fcbeb1c36b reformatting: test.c 2016-10-11 00:34:19 +07:00
Max Bruckner 1822521a14 Merge pull request #36 from iMobs/const_objects 
Add const qualifiers
 2016-10-10 13:29:51 +07:00
Ian Mobley b393b3beeb Add const qualifier for non-destructive functions 
Functions like cJSON_Print do not and should not modify the object passed
to them.
 2016-10-07 15:42:11 -07:00
Max Bruckner f0fc6c50ba Merge pull request #29 from DaveGamble/reformatting 
Reformatting code
 2016-10-07 21:11:04 +07:00