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>
8 years ago
Max Bruckner
a1c022fef6
Merge pull request #37 from DaveGamble/reformatting
Reformat cJSON_Utils.c and test.c
8 years ago
Max Bruckner
ddeca82718
reformatting: cJSON.c: fix indentation
8 years ago
Max Bruckner
c0b17dc651
reformatting: cJSONUtils_GenerateMergePatch
8 years ago
Max Bruckner
01a813f642
reformatting: cJSONUtils_MergePatch
8 years ago
Max Bruckner
c65514fcb4
reformatting: cJSONUtils_SortObject
8 years ago
Max Bruckner
8964287ec4
reformatting: cJSONUtils_SortList
8 years ago
Max Bruckner
ec9d1cfedb
reformatting: cJSONUtils_GeneratePatches
8 years ago
Max Bruckner
8879ed5dbc
reformatting: cJSONUtils_CompareToPatch
8 years ago
Max Bruckner
52e53acfc3
reformatting: cJSON_AddPatchToArray
8 years ago
Max Bruckner
d6a6abeca0
reformatting: cJSONUtils_GeneratePatch
8 years ago
Max Bruckner
e8a67f0e4b
reformatting: cJSONUtils_ApplyPatches
8 years ago
Max Bruckner
d883f9b9b0
reformatting: cJSONUtils_ApplyPatch
8 years ago
Max Bruckner
284a8017b7
reformatting: cJSONUtils_Compare
8 years ago
Max Bruckner
1235c62235
reformatting: cJSONUtils_PatchDetach
8 years ago
Max Bruckner
a21a124d40
reformatting: cJSONUtils_InplaceDecodePointerString
8 years ago
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.
8 years ago
Max Bruckner
0c23e8dde0
Merge pull request #40 from jfether/patch-1
Remove redundant test from cJSON_AddItemToArray
8 years ago
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.
8 years ago
Ian Mobley
d4836effc9
Fix compiler warning "array subscript has type char" when using arm-none-eabi-gcc
8 years ago
Max Bruckner
158ddceab3
reformatting: cJSONUtils_FindPointerFromObjectTo
8 years ago
Max Bruckner
c6cb991e3f
reformatting: cJSON.h: remove trailing spaces
8 years ago
Max Bruckner
7771225e35
reformatting: cJSONUtils_PointerEncodedstrcpy
8 years ago
Max Bruckner
3f6716e63a
reformatting: cJSONUtils_PointerEncodedstrlen
8 years ago
Max Bruckner
2f002879c0
reformatting: cJSONUtils_Pstrcasecmp
8 years ago
Max Bruckner
cb6445f47b
reformatting: cJSON_strcasecmp
8 years ago
Max Bruckner
526d6b1312
reformatting: cJSON_Utils.h
8 years ago
Ian Mobley
85aa59be38
Use $(AR) environment variable with libcjson.a
Allow for alternative archive tool when using make.
8 years ago
Max Bruckner
fcbeb1c36b
reformatting: test.c
8 years ago
Max Bruckner
1822521a14
Merge pull request #36 from iMobs/const_objects
Add const qualifiers
8 years ago
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.
8 years ago
Max Bruckner
f0fc6c50ba
Merge pull request #29 from DaveGamble/reformatting
Reformatting code
8 years ago
Max Bruckner
ad3d5130b5
reformatting: cJSON.h
8 years ago
Max Bruckner
34388c2d4c
reformatting: cJSON_Minify
8 years ago
Max Bruckner
9adc6e7fe1
reformatting: cJSON_Duplicate
8 years ago
Max Bruckner
e6fd236f00
reformatting: cJSON_CreateStringArray
8 years ago
Max Bruckner
e272f7285e
reformatting: cJSON_CreateDoubleArray
8 years ago
Max Bruckner
890b999e59
reformatting cJSON_CreateFloatArray
8 years ago
Max Bruckner
f831aef5c1
reformatting: cJSON_CreateIntArray
8 years ago
Max Bruckner
21a0a88f19
reformatting: cJSON_CreateObject
8 years ago
Max Bruckner
e241081020
reformatting: cJSON_CreateArray
8 years ago
Max Bruckner
034003ce2b
reformatting: cJSON_CreateString
8 years ago
Max Bruckner
3f9f4970b4
reformatting: cJSON_CreateNumber
8 years ago
Max Bruckner
99f61f2b35
reformatting: cJSON_CreateBool
8 years ago
Max Bruckner
a0b5d6b13a
reformatting: cJSON_CreateFalse
8 years ago
Max Bruckner
fdfb9fff86
reformatting: cJSON_CreateTrue
8 years ago
Max Bruckner
cf7835b67d
reformatting: cJSON_CreateNull
8 years ago
Max Bruckner
3a8043273e
reformatting: cJSON_ReplaceItemInObject
8 years ago
Max Bruckner
dc8eb30467
reformatting: cJSON_ReplaceItemInArray
8 years ago
Max Bruckner
69dcfcf238
reformatting: cJSON_InsertItemInArray
8 years ago