3party/cJSON
0
0
Fork 0
mirror of https://github.com/DaveGamble/cJSON.git synced 2025-01-15 03:57:59 +08:00
Code Issues Projects Releases Wiki Activity
922 Commits 11 Branches 48 Tags 3.6 MiB
Commit Graph

922 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kyle Chisholm
8df4cd46eb more concise return 2016-11-28 22:59:55 +07:00
Kyle Chisholm
3917fb5255 use print_preallocated function to test printout of JSON 2016-11-28 22:59:55 +07:00
Kyle Chisholm
99896d879c function to print and compare to preallocated buffer 2016-11-28 22:59:55 +07:00
Kyle Chisholm
4d1dcaa160 check print_value return 2016-11-28 22:59:54 +07:00
Kyle Chisholm
de93d76d0b changed to cJSON_PrintPreallocated, added flag in printbuffer 2016-11-28 22:59:53 +07:00
Kyle Chisholm
602c241a0b fixed "make test" on Mac (clang) 2016-11-28 22:53:36 +07:00
Kyle Chisholm
23dafa4739 added Print function call for pre-allocated buffer 2016-11-28 22:53:33 +07:00
Max Bruckner
59cf4112d2 Merge pull request #78 from gatzka/feature/gcc_check_strict_overflow_v2 
gcc check strict overflow v2
 2016-11-28 22:29:03 +07:00
Stephan
5cfda2292f Warn if compiler optimizes based on asumption signed overflow does not occur. 
This switch is only active when making a release build.
 2016-11-28 09:12:17 +01:00
Stephan
038b04d80a Take out len from condition check. 
Otherwise, the check is just undefined behaviour. gcc even takes out
this check because len can never be zero if len does not wrap around.

Found with -Wstrict-overflow=2
 2016-11-28 09:11:14 +01:00
Max Bruckner
624bc85143 contributors: add Stephan Gatzka 2016-11-28 01:03:04 +07:00
Max Bruckner
1f0ad823c9 Merge pull request #75 from gatzka/feature/enhance_gcc_checks_v2 
Enhance gcc checks v2
 2016-11-28 00:58:45 +07:00
Stephan Gatzka
29b6643bab Warn about missing prototypes. 
This switch warns about missing prototypes. It does not warn if
functions are declared static. So this switch encourages the usage of
static whenever possible. This enables the compiler to perform inlining.
 2016-11-27 18:22:12 +01:00
Stephan Gatzka
a8e1368697 Make function static when possible. 
This is a prerequisite to later enable -Wmissing-prototypes.
 2016-11-27 18:20:58 +01:00
Stephan Gatzka
bea0be48b6 Perform additional format checks. 2016-11-27 18:20:41 +01:00
Stephan Gatzka
91d11cd050 Warn if casting a pointer increases alignment of target. 2016-11-27 18:19:52 +01:00
Stephan Gatzka
9591ecddbe Warn about variables initialized by themselves. 2016-11-27 18:19:07 +01:00
Stephan Gatzka
1568015de6 Warn about shadowing variables and functions. 2016-11-27 18:18:00 +01:00
Stephan Gatzka
7ed067e680 Rename some variables to avoid shadowing. 2016-11-27 18:16:28 +01:00
Max Bruckner
4703f01cf4 Make/CMake: Fix use of compiler flags 
CMake: Option was not enabled by default as intended.
Makefile: Flags were not passed when building the tests
 2016-11-26 22:09:20 +07:00
Max Bruckner
d0a9f46888 Release v1.0.2 v1.0.2 2016-11-25 08:22:41 +07:00
Max Bruckner
23b269d5f9 Rename bool -> cjbool, fix #71 2016-11-25 08:19:18 +07:00
Max Bruckner
11fd27ade7 Change version to 1.0.1 v1.0.1 2016-11-20 01:08:54 +07:00
Max Bruckner
65ac0a1a2b cJSON_Utils tests: fix formatting 2016-11-19 17:50:01 +07:00
Max Bruckner
679004914f Define a boolean type 
This is not changing the behavior of the code, but it is improving the
readability and helps to make the intention clearer.

One thing to take care: 'true' should never be compared against.
 2016-11-19 17:29:22 +07:00
Max Bruckner
b88da9b0de Initialize all variables 2016-11-19 17:29:21 +07:00
Max Bruckner
a5ff796c20 Replace 0 with more expressive NULL or '\0' 2016-11-19 17:28:14 +07:00
Max Bruckner
d47339e274 cJSON_Utils: Fix comparing of cJSON_ types 
When comparing the type, it has to be masked with 0xFF because of
cJSON_IsConst and cJSON_IsReference.
 2016-11-18 22:52:52 +07:00
Max Bruckner
aafb64a1c5 Merge pull request #66 from DaveGamble/v1 
Release version 1.0.0
v1.0.0 		2016-11-17 08:19:08 +07:00
Max Bruckner
3a2151d267 README: Document ENABLE_CUSTOM_COMPILER_FLAGS 2016-11-15 20:23:47 +07:00
Max Bruckner
f2cb5e4dd4 CMake: ENABLE_CUSTOM_COMPILER_FLAGS option 2016-11-15 20:21:57 +07:00
Max Bruckner
46a3a102d5 CMake: Fix indentation 2016-11-15 20:21:30 +07:00
Max Bruckner
1f3b95e2b1 README: Compiles on FreeBSD 2016-11-15 20:19:02 +07:00
Max Bruckner
706636fb20 Replace -ansi with -std=c89 for better compatibility 2016-11-15 20:03:11 +07:00
Max Bruckner
a22da43578 README: More formatting 2016-11-15 08:12:35 +07:00
Max Bruckner
df1ffa1e0b README: Building 2016-11-15 02:01:38 +07:00
Max Bruckner
501be02690 README: Reformat 2016-11-15 00:29:23 +07:00
Max Bruckner
778bcd1a62 Makefile: Redo with library versioning 
And remove special handling of SunOs
 2016-11-14 22:52:44 +07:00
Max Bruckner
46ff20c8b0 cJSON.h: add stddef.h because of size_t 2016-11-14 22:25:16 +07:00
Max Bruckner
5cca67e3fc CMake: Build tests by default 2016-11-14 19:36:04 +07:00
Max Bruckner
dc4b62915a fix #10, now failing on incorrect escape sequences 2016-11-14 19:33:03 +07:00
Max Bruckner
afd690d1c9 format fix 2016-11-14 19:14:14 +07:00
Max Bruckner
cfd0fb83d3 CMake: Fix warning on Cygwin 2016-11-14 19:14:14 +07:00
Max Bruckner
c213f2eb58 cJSON: Option to disable exporting targets 
This can be disabled when the exporting of the targets causes problems.
 2016-11-14 19:14:13 +07:00
Max Bruckner
5838e279a5 CMake: Use CMAKE_C_FLAGS instead of add_compile_options 
This is for compatibility reasons with old CMake 2.8 versions.
 2016-11-14 19:14:13 +07:00
Max Bruckner
966646d70e CMake config: Add CJSON_INCLUDE_DIR 2016-11-14 19:14:13 +07:00
Max Bruckner
58b76b518a CMake: Fix export of targets 
The prior approach was exporting paths from the build environment.
 2016-11-14 19:14:13 +07:00
Max Bruckner
8a838b37e3 CMake: Use standard variables for the version 2016-11-14 19:14:12 +07:00
Max Bruckner
de992ec3c9 pkg-config: Add URL and link math library 2016-11-14 19:14:12 +07:00
Max Bruckner
f9ce93029a Buildsystem: Fix paths 
Fix library and include paths in pkg-config, CMakeLists.txt and the
CMake config files.
 2016-11-14 19:14:12 +07:00
Markus Blatt
251e5a5e34 Added rudimentary package configuration files. 
These files will allow cmake based projects to find the
library using find_package(cJSON). If successful, they can
use CJSON_LIBRARIES and CJSON_INCLUDE_DIRS.

Other build systems can use a similar approach to pkg-config:
cmake --find-package -DNAME=cJSON -DCOMPILER_ID=GNU -DLANGUAGE=C  -DCMAKE_PREFIX_PATH=<path-to-non-sytem-installation-path> -DMODE=LINK

or with MODE COMPILE or EXISTS.
 2016-11-14 19:14:12 +07:00
Max Bruckner
8a7f9a2101 CMake: Use the GNUInstallDirs module 2016-11-14 19:14:12 +07:00
Max Bruckner
78cdb0d6ec CMake: Quote all variables 2016-11-14 19:14:11 +07:00
Max Bruckner
b2283dab87 CMake: Use CMAKE_CURRENT_SOURCE/BINARY_DIR 2016-11-14 19:14:11 +07:00
Max Bruckner
3353062fc8 CMake: Make building of cJSON_Utils optional 
Turned off by default.
 2016-11-14 19:14:11 +07:00
Max Bruckner
97b255c736 CMake: Fix installation of libcjson_utils.pc 2016-11-14 19:14:11 +07:00
Max Bruckner
fad10d5b1e Update list of contributors 2016-11-14 19:14:11 +07:00
Max Bruckner
302c574e00 CMake: Add compiler options only for Clang and GCC 2016-11-14 19:14:10 +07:00
Max Bruckner
576d9bb24f CMake: Only one project 2016-11-14 19:14:10 +07:00
Max Bruckner
47841ed3a7 CMake: Build test by default 2016-11-14 19:14:10 +07:00
Max Bruckner
c3fecc2d07 CMake: Build shared libraries by default 
This is also what other projects are doing.
 2016-11-14 19:14:10 +07:00
Max Bruckner
9acd1c6e7e Add list of contributors 2016-11-14 19:14:10 +07:00
Max Bruckner
aee8cb9231 pkg-config: Add libcjson_utils.pc 2016-11-14 19:14:09 +07:00
Max Bruckner
3d546c7036 pkg-config: Update libcjson.pc.in 2016-11-14 19:14:09 +07:00
Paulo Antonio Alvarez
d5baeff85f Add pkg-config file support for libcjson 
We configure and install a pkg-config file so that our compilation and
linking flags can be more easily found using pkg-config.
 2016-11-14 19:14:09 +07:00
Max Bruckner
32a9870786 CMake: Separate so version for cJSON_Utils 2016-11-14 19:14:09 +07:00
Max Bruckner
fd38fb712d CMake: Add compile options 2016-11-14 19:14:09 +07:00
Max Bruckner
ba6389291f CMake: Set library version 2016-11-14 19:14:08 +07:00
Max Bruckner
ba593394d4 CMake: Change include directory cJSON -> cjson 2016-11-14 19:14:08 +07:00
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 v0.0.0 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 3ea491c0a603f50ca0fb2505badd332fbd141f75.
 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