Max Bruckner
ba6389291f
CMake: Set library version
8 years ago
Max Bruckner
ba593394d4
CMake: Change include directory cJSON -> cjson
8 years ago
Max Bruckner
0d6ccf032d
CMake: Change library names to all lowercase
Library names:
libcJSON -> libcjson
libcJSON_utils -> libcjson_utils
8 years ago
Max Bruckner
34361dbb9b
CMake: Reformat
8 years ago
Max Bruckner
81e95718d5
CMake: Regroup lines
8 years ago
Max Bruckner
9a4657fbee
CMake: Set version and soversion
8 years ago
Max Bruckner
8a46cb7b55
gitignore: ignore build directory
8 years ago
Jiri Zouhar
06008b0444
add support to insert raw json
8 years ago
Max Bruckner
0d10e279c8
fix #55 memory leak in cJSON_ReplaceItemInObject
8 years ago
Max Bruckner
9e31049159
test and test_utils: Make compliant with ANSI C
8 years ago
Max Bruckner
8ac1ba416e
test: Fix unescaped quote
8 years ago
Max Bruckner
25b65feb36
Remove old readme. It was replaced by README.md
8 years ago
Max Bruckner
1dff6f160f
cJSON_Utils: own strdup for C89 compatibility
8 years ago
Max Bruckner
a148520ffb
Revert "Fix #26 : Use long double literal for 1e60"
This reverts commit 3ea491c0a6
.
8 years ago
Max Bruckner
b4d728d018
pow2gt: Detect integer size fix #27
8 years ago
Max Bruckner
3ea491c0a6
Fix #26 : Use long double literal for 1e60
Big thanks at mvollmer (https://sourceforge.net/p/cjson/bugs/45/ )
8 years ago
Max Bruckner
050829f274
Merge pull request #50 from ffontaine/master
Do not always build static and dynamic
8 years ago
Max Bruckner
4d06882c68
Merge pull request #44 from iMobs/arm_compilation
ARM Compilation
8 years ago
Max Bruckner
b355733aa1
Merge pull request #43 from rvagg/malloc-err
don't ignore malloc failure in cJSON_PrintBuffered
8 years ago
Rod Vagg
5323f558cd
don't ignore malloc failure in cJSON_PrintBuffered
8 years ago
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