Eric Haszlakiewicz
b484ff0b6d
Merge d447fbc
from master to json-c-0.13, to avoid installing private headers.
7 years ago
Eric Haszlakiewicz
d447fbca77
Don't include private headers when installing.
7 years ago
Eric Haszlakiewicz
17374f345d
Add generated docs for the 0.13 release.
7 years ago
Eric Haszlakiewicz
0c991854a1
Save autoconf/automake generated files for the new 0.13 release.
7 years ago
Eric Haszlakiewicz
1f3bc5f20c
Bump the version up to 0.13
7 years ago
Eric Haszlakiewicz
d582d3ae5a
Undeprecate the array_list, lh_table and printbuf typedefs, but move each to the corresponding header files.
7 years ago
Eric Haszlakiewicz
8c82f0e5c3
Squash doxygen warnings, and make a few slight improvements to the docs.
7 years ago
Eric Haszlakiewicz
219025727d
Upgrade doxygen's Doxyfile to version 1.8.8
7 years ago
Eric Haszlakiewicz
f2f103b986
Add a brief overview of each file to the docs.
7 years ago
Eric Haszlakiewicz
d6d81e6ece
Adjust the description of json_object_iterator a bit.
7 years ago
Eric Haszlakiewicz
c01635e03e
Rearrange README.md a bit and make it work better in the doxygen generated docs.
Also, add a table of contents, and a brief section on using json-c with links to
the header files most likely to be useful.
7 years ago
Eric Haszlakiewicz
ae242720b6
Add a couple more issues to the list of those closed for 0.13
7 years ago
Eric Haszlakiewicz
11ab365324
Deprecated a few typedefs, add docs on json_object_iter, move json_number_chars and json_hex-chars to json_object_private.h.
7 years ago
Eric Haszlakiewicz
a47eafe868
Cast to int64_t instead of long in test_int_add to fix the test on 32-bit platforms.
7 years ago
Eric Haszlakiewicz
0e7ec2ffcd
Add cast to int on tolower() to fix warnings about array subscripts.
7 years ago
Eric Haszlakiewicz
aedd36ac8b
Make sure to include the "*" on function pointer arguments to avoid a warnings from VS2015. See also PR#384.
7 years ago
Eric Haszlakiewicz
95015d474e
Merge pull request #384 from ssrlive/patch-1
Fix a VS 2015 compiler warning.
7 years ago
ssrlive
2643658b6f
Update json_object.c
7 years ago
ssrlive
7709cb1355
Fix a VS 2015 compiler warning.
In VS 2015, the warning text is "warning C4550: expression evaluates to a function which is missing an argument list".
7 years ago
Eric Haszlakiewicz
b34d26ff25
Add a change log entry for the upcoming 0.13 release.
7 years ago
Eric Haszlakiewicz
e00a07b885
Clean up *.vg.out files too to "make distcheck" works.
7 years ago
Eric Haszlakiewicz
5dae561d33
In json_object_deep_copy(), copy over _userdata, at least for json_type_string's with the default serializer set, and provide a way for people using custom serializers to provide a custom shallow_copy method.
7 years ago
Eric Haszlakiewicz
96efeadd6e
Always build the json_object_deep_copy() code, but conditionalize running it on a --benchmark command line option.
7 years ago
Eric Haszlakiewicz
437716c5b4
Rename _set_last_err() to _json_c_set_last_err().
7 years ago
Eric Haszlakiewicz
d99edade72
Merge branch 'commodo-json_deep_copy'
7 years ago
Eric Haszlakiewicz
4dd92180c6
Merge branch 'json_deep_copy' of https://github.com/commodo/json-c into commodo-json_deep_copy
7 years ago
Eric Haszlakiewicz
3628f16dd6
Rename json_object_add_int() to json_object_int_inc() and eliminate the "int64" variant since we store 64-bit values internally anyway.
7 years ago
Alexandru Ardelean
1eab22f0da
tests: add test_deep_copy test
Seems to perform better than outputting to string
and re-parsing it.
BENCHMARK - 1000000 iterations of 'dst2 = json_tokener_parse(json_object_get_string(src2))' took 20 seconds
BENCHMARK - 1000000 iterations of 'dst2 = json_tokener_parse(json_object_get_string(src2))' took 7 seconds
It should make a difference on embedded systems.
The test was performed on a i5 desktop CPU [~3.5 years of age].
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
8 years ago
Alexandru Ardelean
bf80d5ad0e
json_object: implement json_object_deep_copy()
Because doing `json_tokener_parse(json_object_get_string(src))`
feels sloppy, dirty, and makes me want to cry at night
sometimes.
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
8 years ago
Eric Haszlakiewicz
91662a5b69
Merge pull request #363 from jvijtiuk/integer_addition
Issue #338 , add json_object_add_int functions
7 years ago
Eric Haszlakiewicz
9c9529f798
Update test_parse.expected to match the code.
7 years ago
Eric Haszlakiewicz
f81da5e57a
Rewrite the json_tokener_state_inf handling in json_tokener to be simpler, and avoid needless copying of the input into a temporary buffer.
7 years ago
Eric Haszlakiewicz
31a6c2fac8
Add a few more tests to the partial parse to cover bytes after "Infinity".
7 years ago
Eric Haszlakiewicz
ba11d334db
Save proper expected output for test_parse from the previous commit.
7 years ago
Eric Haszlakiewicz
48f7e389fb
Fix parsing of "-Infinity" when the "-" and "Infinity" are split across multiple calls.
Add several additional test cases for partial parsing of infinity values.
7 years ago
Eric Haszlakiewicz
4d1e0b4409
Issue #371 : fix parsing of "-Infinity" (although in a somewhat different location than PR#372 used), and add a case to test_parse to check for this.
7 years ago
Eric Haszlakiewicz
2a22858fe7
Add a few extra cases to test_parse to show how trailing bytes are handled, especially for parsing "Infinity".
7 years ago
Eric Haszlakiewicz
b8738dd623
Rewrite test_basic_parse() to factor out a single_basic_parse() to avoid lots of duplicate boiler plate code.
Also, emit the input string in the output so it's easier to see what's going on.
7 years ago
Eric Haszlakiewicz
05c85ddc21
On VS 2013 and newer, actually use strtoll instead of redefining it to _strtoi64.
7 years ago
Eric Haszlakiewicz
04788421fe
Merge pull request #373 from commodo/fix-appveyor-build
build: fix build on appveyor CI
7 years ago
Eric Haszlakiewicz
49003242d1
Merge pull request #381 from busterb/fix-makedist
Fix makedist
7 years ago
Brent Cook
185f43afef
add/remove missing distribution files
7 years ago
Brent Cook
6727b46454
ignore more autoconf goo
7 years ago
Alexandru Ardelean
03f3b95248
json_util: define `strtoll` as _strtoi64 for MSVC
Got the idea from this blog post:
http://www.enchantedage.com/node/231
Simple & concise stuff :)
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
8 years ago
Alexandru Ardelean
5641227c9b
strerror_override: re-organize strerror_override.h
Always include <string.h> before _json_c_strerror() definition.
Should fix linker issues on MSVC.
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
8 years ago
Eric Haszlakiewicz
fabb84a785
Remove out of date win32 build information, and mention the need to use cmake there.
8 years ago
Eric Haszlakiewicz
e424af32b7
Fix definition of NELEM in the tests.
8 years ago
Eric Haszlakiewicz
ac09581cc2
Issue #370 : work around Clang-on-windows oddities by rearranging ifdefs.
8 years ago
Eric Haszlakiewicz
c9c84ca7ee
Issue #369 : note some useful settings when building for Android.
8 years ago
Eric Haszlakiewicz
cf913621f1
Use cmake to create the json-c.pc file, as suggested by PR#362.
8 years ago