Max Bruckner
e7533aa6f0
Put version information in the header
...
This is important so that it is always known which version of the
library is used, especially if the C and Header files have just been
copy pasted to another code base.
2017-01-12 20:35:13 +01:00
Max Bruckner
de8eaaba89
Release version 1.2.0
2017-01-09 12:25:31 +01:00
Max Bruckner
b2da44d6cb
Merge pull request #90 from DaveGamble/cJSON_Raw
...
Add support for raw JSON
2017-01-09 12:22:00 +01:00
Max Bruckner
f6998a6a34
Contributors: Add Jiri Zouhar
2017-01-09 12:02:21 +01:00
Max Bruckner
e3e0b5150b
cJSON_CreateRaw: Format fixes
2017-01-05 21:33:52 +01:00
Max Bruckner
1df987a170
cJSON_strdup: Check for NULL string
2017-01-05 21:31:17 +01:00
Max Bruckner
ddadb44a67
cJSON_Raw: Additional checks in print_value
2017-01-05 21:30:37 +01:00
Max Bruckner
9ef44fc0b6
Remove C++ comment in header
2017-01-05 21:12:10 +01:00
Max Bruckner
8c58e62597
Merge remote-tracking branch 'loigu/master' into cJSON_Raw
2017-01-05 21:07:08 +01:00
Max Bruckner
8893e39712
gitignore: ignore *.orig
2017-01-04 20:40:34 +01:00
Max Bruckner
3d6ae11340
Make cJSON C++ compatible
2016-12-28 12:33:20 +01:00
Max Bruckner
a1f2600883
Contributors: Add Romain Porte
2016-12-28 12:29:03 +01:00
Max Bruckner
fcc85bdfbc
Gitignore: Add Makefile output
2016-12-28 12:23:56 +01:00
Max Bruckner
7d08a3518a
Merge pull request #88 from MicroJoe/fix-readme-tests
...
Fix bad CMake argument in README
2016-12-28 12:20:37 +01:00
Max Bruckner
fcc89c4bb2
Move increment out of loop condition fixes #85
2016-12-15 11:12:42 +01:00
Max Bruckner
a0431e226f
Merge pull request #83 from gatzka/feature/cast_qual_v3
...
Introduce compiler check if const is casted away.
2016-12-08 21:59:32 +07:00
Max Bruckner
5310da351d
contributors: Add Alper Akcan
2016-12-06 09:01:12 +07:00
Max Bruckner
68196f5b14
Release version 1.1.0
2016-12-06 08:56:23 +07:00
Max Bruckner
d992cd46e6
test: Handle cJSON_PrintPreallocated return values correctly
2016-12-06 08:47:44 +07:00
Max Bruckner
84b48121bb
header: explain PrintPreallocated return value
2016-12-06 08:46:48 +07:00
Max Bruckner
f10e2f884a
test: exit on malloc failure
2016-12-06 08:41:51 +07:00
Max Bruckner
eeb6d237b6
Merge pull request #81 from alperakcan/master
...
fix memory leak in cJSON_Duplicate
2016-12-06 08:36:47 +07:00
Max Bruckner
e1eb06fae0
cJSON.h warn about write access to constants ( #80 )
...
Add a comment that warns about potential write access to constant memory
locations after using cJSON_AddItemToObjectCS.
2016-11-30 22:14:16 +07:00
Max Bruckner
6aefa45056
Merge pull request #79 from gatzka/fix/test
...
Make print_preallocated static.
2016-11-29 08:19:33 +07:00
Max Bruckner
3da18a2df9
contributors: Add Kyle Chisholm
2016-11-29 00:01:21 +07:00
Max Bruckner
bf17703012
Merge branch 'print_preallocated'
2016-11-28 23:08:25 +07:00
Max Bruckner
6622c54f18
Handle out of memory when printing string
2016-11-28 23:06:38 +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
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
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
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
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
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
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
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
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
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