Eric Haszlakiewicz
d5da847f51
PR#394: don't always append the ".0" if the double value rounds to zero because some custom formats *will* include it (e.g. %.2f).
Also try to accomodate formats to explicitly exclude the decimal (e.g. %.0f).
7 years ago
Eric Haszlakiewicz
0992aac61f
Remove the TRUE and FALSE defines.
7 years ago
Eric Haszlakiewicz
cfd09c87f0
Merge pull request #393 from besser82/enhancement/unsigned_refcount
json_object_private: Use unsigned 32-bit integer type for refcount
7 years ago
Björn Esser
c233f5c05e
json_object_private: Use unsigned 32-bit integer type for refcount
7 years ago
Eric Haszlakiewicz
5ea6a05bfa
Merge pull request #389 from besser82/bugfix/invalid_free
json_object: Avoid double free (and thus a segfault) when ref_count gets < 0
7 years ago
Björn Esser
9aca3b6a08
json_object: Avoid invalid free (and thus a segfault) when ref_count gets < 0
7 years ago
Eric Haszlakiewicz
8c214902d9
Merge pull request #386 from besser82/bugfix/aclocal_amflags
Makefile: Add ACLOCAL_AMFLAGS
7 years ago
Eric Haszlakiewicz
e411b1a36e
Merge pull request #391 from rikardfalkeborn/fix-const-function-define
Fix non-GNUC define for JSON_C_CONST_FUNCTION
7 years ago
Rikard Falkeborn
84dcc01da1
Fix non-GNUC define for JSON_C_CONST_FUNCTION
7 years ago
Björn Esser
87556afe2a
Makefile: Add ACLOCAL_AMFLAGS
This is recommended by the libtool manual.
7 years ago
Eric Haszlakiewicz
5b6d62259a
Apply gcc's "const" attribute to the json_c_object_sizeof() function as an optimizer hint. Also, rename that function from json_object_sizeof().
7 years ago
Eric Haszlakiewicz
94fd101601
Merge pull request #388 from besser82/enhancement/json_object_sizeof
json_object: Add size_t json_object_sizeof()
7 years ago
Eric Haszlakiewicz
25afa92ed5
Merge pull request #387 from LeSpocky/doc
doc: Use other doxygen feature to specify mainpage
7 years ago
Björn Esser
c123a1c21b
json_object: Add size_t json_object_sizeof()
7 years ago
Alexander Dahl
89747ac758
doc: Use other doxygen feature to specify mainpage
Previously a special tag was added to README.md to make this the
main page in Doxygen generated docs. When viewing the README on the
GitHub page this tag was not hidden.
After upgrading to Doxygen 1.8.8 (and above) in changeset
219025727d
a new Doxygen feature can be
used to specify the main page: Since release 1.8.3 Doxygen has a special
option to set a markdown file as main page. When using this option we
can drop the tag, making the README rendered by GitHub nice to look at.
Fixes: ae66b24369
7 years ago
Eric Haszlakiewicz
a19031411d
Remove the previously deprecated lh_table_lookup() function, in favor of lh_table_lookup_ex().
7 years ago
Eric Haszlakiewicz
f83cf244cd
Remove the previously deprecated bits.h and the lh_abort() function.
7 years ago
Eric Haszlakiewicz
963e707ca4
Drop mention of README-WIN32.html in the release checklist.
7 years ago
Eric Haszlakiewicz
0631c37c7f
Update the master branch to version 0.13.99
7 years ago
Eric Haszlakiewicz
8c4a941475
Tweak the release checklist slightly to fix problems noticed during this past release process.
7 years ago
Eric Haszlakiewicz
d447fbca77
Don't include private headers when installing.
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