mirror/json-c
1
0
Fork 0
mirror of https://github.com/json-c/json-c.git synced 2026-09-07 16:46:50 +08:00
Code Issues Packages Projects Releases Wiki Activity
750 Commits 16 Branches 12 Tags
c3e11d6812c4ffecd419eebbf04538167473686a
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Haszlakiewicz ebe520e96e Merge pull request #450 from drizt/subproject 
Allow use json-c cmake as subproject
 2018-10-20 23:01:20 -04:00
Eric Haszlakiewicz 994e6c1f60 Re-add creation and installation of the json-c.pc file to the cmake build. 2018-09-01 15:06:14 -04:00
Eric Haszlakiewicz 705e2fd010 Merge pull request #444 from Hawk777/document-ref-count-tokener 
Document refcount of json_tokener_parse_ex return
 2018-08-31 01:16:53 -04:00
Eric Haszlakiewicz 0a8ac2ed92 Merge pull request #441 from changyongGuo/c_flag_error 
fix c flag loss during cmake building
 2018-08-14 20:40:49 -04:00
Eric Haszlakiewicz bf29aa0f8c Merge pull request #434 from unmanned-player/devel 
The real CMake support
 2018-07-28 11:59:46 -04:00
Eric Haszlakiewicz 91f9884591 Merge pull request #436 from jobol/master 
Improve pkgconfig setting
 2018-07-26 23:28:42 -04:00
Eric Haszlakiewicz 2327b23d8e Merge pull request #431 from LeSpocky/cmake 
cmake: Bump required version
 2018-07-12 22:26:48 -04:00
Eric Haszlakiewicz 3df1f98b4a Explain why we're not setting the output name for static libraries when on Windows. 2018-06-23 22:10:55 -04:00
Eric Haszlakiewicz a056893263 Merge pull request #415 from sgbihu/master 
Resolve windows name conflict
 2018-06-23 22:08:25 -04:00
Eric Haszlakiewicz e3752b5894 Issue #418: Fix docs for json_util_from_fd and json_util_from_file to say that they return NULL on failures. 2018-06-14 22:24:45 -04:00
Eric Haszlakiewicz c1c71097a1 Issue #419: document that NULL may be passed to json_object_put(). 2018-06-12 23:16:31 -04:00
Eric Haszlakiewicz fb042f449b Merge pull request #421 from lt-holman/install_header_file 
install json_object_iterator.h header file
 2018-06-08 23:45:47 -04:00
Eric Haszlakiewicz 4bbc72f633 Merge pull request #420 from angelskieglazki/master 
arraylist: Fixed names of parameters for callback function
 2018-06-02 23:01:04 -04:00
Eric Haszlakiewicz 4414d068b3 Always create debug info (pdb file) even for release builds. 2018-05-27 21:50:57 -04:00
Eric Haszlakiewicz 7038bb8061 Try the appveyor changes again, using %Configuration% instead of "Debug" 2018-05-27 18:20:32 -04:00
Eric Haszlakiewicz dfc0fddf22 Include the json-c.lib, .pdb and .exp files in the zip file created by the appveyor build, since it seems they're needed for linking and debugging. 2018-05-27 16:07:11 -04:00
Eric Haszlakiewicz c75ebe8973 Merge pull request #410 from janczer/fix-typos 
Fixed typos
 2018-04-24 22:01:09 -04:00
Eric Haszlakiewicz f8c632f579 Issue #407: fix incorrect casts in calls to ctype functions (isdigit and isspace) so we don't crash when asserts are enabled on certain platforms and characters > 128 are parsed. 2018-03-25 18:25:58 -04:00
Eric Haszlakiewicz da4b34355d Add an parse test for content starting with a UTF8 BOM, which is _not_ a valid start to a JSON message. 2018-03-25 18:23:42 -04:00
Eric Haszlakiewicz 104aef0a6e Update the change log for the 0.13.1 release. 2018-03-05 22:54:57 -05:00
Eric Haszlakiewicz 2fd95844c3 Issue #396: check for toolchain compatibilty with _REENTRANT before adding it to CFLAGS. 2018-03-04 22:32:45 -05:00
Eric Haszlakiewicz 1e301d94be Merge pull request #402 from derwolfe/fuzz 
Add fuzzers from OSS-Fuzz
 2018-02-19 13:54:18 -05:00
Eric Haszlakiewicz f8eb1dec64 Merge pull request #399 from jonathan-wiens/bugfix/initialize_variable 
Avoid uninitialized variable warnings
 2018-01-26 23:46:33 -05:00
Eric Haszlakiewicz 250de31f17 Bump the major version of the .so library generated up to 4.0 to avoid conflicts because some downstream packagers of json-c had already done their own bump to ".so.3" for a much older 0.12 release. 2018-01-15 23:31:55 -05:00
Eric Haszlakiewicz c652b6ad29 PR#394: fix breakage with VS build. 2017-12-24 14:42:58 -05:00
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).
 2017-12-24 13:45:52 -05:00
Eric Haszlakiewicz 0992aac61f Remove the TRUE and FALSE defines. 2017-12-23 09:42:17 -05:00
Eric Haszlakiewicz cfd09c87f0 Merge pull request #393 from besser82/enhancement/unsigned_refcount 
json_object_private: Use unsigned 32-bit integer type for refcount
 2017-12-17 09:52:27 -05:00
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
 2017-12-14 09:28:06 -05:00
Eric Haszlakiewicz 8c214902d9 Merge pull request #386 from besser82/bugfix/aclocal_amflags 
Makefile: Add ACLOCAL_AMFLAGS
 2017-12-13 22:03:20 -05:00
Eric Haszlakiewicz e411b1a36e Merge pull request #391 from rikardfalkeborn/fix-const-function-define 
Fix non-GNUC define for JSON_C_CONST_FUNCTION
 2017-12-13 21:51:13 -05:00
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(). 2017-12-12 18:26:51 -05:00
Eric Haszlakiewicz 94fd101601 Merge pull request #388 from besser82/enhancement/json_object_sizeof 
json_object: Add size_t json_object_sizeof()
 2017-12-12 18:14:40 -05:00
Eric Haszlakiewicz 25afa92ed5 Merge pull request #387 from LeSpocky/doc 
doc: Use other doxygen feature to specify mainpage
 2017-12-12 09:13:36 -05:00
Eric Haszlakiewicz a19031411d Remove the previously deprecated lh_table_lookup() function, in favor of lh_table_lookup_ex(). 2017-12-10 00:27:01 -05:00
Eric Haszlakiewicz f83cf244cd Remove the previously deprecated bits.h and the lh_abort() function. 2017-12-10 00:25:00 -05:00
Eric Haszlakiewicz 963e707ca4 Drop mention of README-WIN32.html in the release checklist. 2017-12-09 15:12:08 -05:00
Eric Haszlakiewicz 0631c37c7f Update the master branch to version 0.13.99 2017-12-09 14:59:48 -05:00
Eric Haszlakiewicz 8c4a941475 Tweak the release checklist slightly to fix problems noticed during this past release process. 2017-12-09 14:59:05 -05:00
Eric Haszlakiewicz d447fbca77 Don't include private headers when installing. 2017-12-07 18:24:08 -05:00
Eric Haszlakiewicz d582d3ae5a Undeprecate the array_list, lh_table and printbuf typedefs, but move each to the corresponding header files. 2017-12-06 23:58:33 -05:00
Eric Haszlakiewicz 8c82f0e5c3 Squash doxygen warnings, and make a few slight improvements to the docs. 2017-12-06 23:53:12 -05:00
Eric Haszlakiewicz 219025727d Upgrade doxygen's Doxyfile to version 1.8.8 2017-12-06 00:27:53 -05:00
Eric Haszlakiewicz f2f103b986 Add a brief overview of each file to the docs. 2017-12-06 00:20:59 -05:00
Eric Haszlakiewicz d6d81e6ece Adjust the description of json_object_iterator a bit. 2017-12-05 18:43:18 -05:00
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.
 2017-12-05 18:01:43 -05:00
Eric Haszlakiewicz ae242720b6 Add a couple more issues to the list of those closed for 0.13 2017-12-05 18:00:09 -05:00
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. 2017-12-05 09:20:59 -05:00
Eric Haszlakiewicz a47eafe868 Cast to int64_t instead of long in test_int_add to fix the test on 32-bit platforms. 2017-12-05 04:32:12 +00:00
Eric Haszlakiewicz 0e7ec2ffcd Add cast to int on tolower() to fix warnings about array subscripts. 2017-12-05 04:29:36 +00:00
Eric Haszlakiewicz aedd36ac8b Make sure to include the "*" on function pointer arguments to avoid a warnings from VS2015. See also PR#384. 2017-12-04 18:17:52 -05:00
Eric Haszlakiewicz 95015d474e Merge pull request #384 from ssrlive/patch-1 
Fix a VS 2015 compiler warning.
 2017-12-04 18:11:09 -05:00
Eric Haszlakiewicz b34d26ff25 Add a change log entry for the upcoming 0.13 release. 2017-12-02 22:13:22 -05:00
Eric Haszlakiewicz e00a07b885 Clean up *.vg.out files too to "make distcheck" works. 2017-11-30 18:17:04 -05:00
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. 2017-11-29 23:35:38 -05:00
Eric Haszlakiewicz 96efeadd6e Always build the json_object_deep_copy() code, but conditionalize running it on a --benchmark command line option. 2017-11-29 17:58:57 -05:00
Eric Haszlakiewicz 437716c5b4 Rename _set_last_err() to _json_c_set_last_err(). 2017-11-29 09:36:53 -05:00
Eric Haszlakiewicz d99edade72 Merge branch 'commodo-json_deep_copy' 2017-11-29 09:13:32 -05:00
Eric Haszlakiewicz 4dd92180c6 Merge branch 'json_deep_copy' of https://github.com/commodo/json-c into commodo-json_deep_copy 2017-11-29 09:12:59 -05:00
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. 2017-11-27 17:57:36 -05:00
Eric Haszlakiewicz 91662a5b69 Merge pull request #363 from jvijtiuk/integer_addition 
Issue #338, add json_object_add_int functions
 2017-11-27 09:06:39 -05:00
Eric Haszlakiewicz 9c9529f798 Update test_parse.expected to match the code. 2017-11-27 08:48:08 -05:00
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. 2017-11-27 00:20:11 -05:00
Eric Haszlakiewicz 31a6c2fac8 Add a few more tests to the partial parse to cover bytes after "Infinity". 2017-11-27 00:18:55 -05:00
Eric Haszlakiewicz ba11d334db Save proper expected output for test_parse from the previous commit. 2017-11-27 00:08:59 -05:00
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.
 2017-11-27 00:04:33 -05:00
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. 2017-11-26 22:44:39 -05:00
Eric Haszlakiewicz 2a22858fe7 Add a few extra cases to test_parse to show how trailing bytes are handled, especially for parsing "Infinity". 2017-11-26 22:34:43 -05:00
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.
 2017-11-26 22:33:36 -05:00
Eric Haszlakiewicz 05c85ddc21 On VS 2013 and newer, actually use strtoll instead of redefining it to _strtoi64. 2017-11-26 14:17:17 -05:00
Eric Haszlakiewicz 04788421fe Merge pull request #373 from commodo/fix-appveyor-build 
build: fix build on appveyor CI
 2017-11-26 14:08:53 -05:00
Eric Haszlakiewicz 49003242d1 Merge pull request #381 from busterb/fix-makedist 
Fix makedist
 2017-11-26 13:57:54 -05:00
Eric Haszlakiewicz fabb84a785 Remove out of date win32 build information, and mention the need to use cmake there. 2017-10-22 22:46:05 -04:00
Eric Haszlakiewicz e424af32b7 Fix definition of NELEM in the tests. 2017-10-22 22:28:35 -04:00
Eric Haszlakiewicz ac09581cc2 Issue #370: work around Clang-on-windows oddities by rearranging ifdefs. 2017-10-22 22:19:41 -04:00
Eric Haszlakiewicz c9c84ca7ee Issue #369: note some useful settings when building for Android. 2017-10-19 23:30:51 -04:00
Eric Haszlakiewicz cf913621f1 Use cmake to create the json-c.pc file, as suggested by PR#362. 2017-10-09 13:16:00 -04:00
Eric Haszlakiewicz 579f0746f0 Issue #173, follow up to using strtoll to allow this to work on older Windows environments: Use cmake to generate config.h from config.h.win32, including checking for strtoll with cmake, or fall back to _strtoi64 for older MSVC's. 
Also, add a few missing files to the list of sources to build.
 2017-10-03 22:50:29 -04:00
Eric Haszlakiewicz cfbdf7757b The new cmake-generated VS builds now generate a dynamic .dll instead of a .lib 2017-09-17 21:44:04 -04:00
Eric Haszlakiewicz 139eb64b43 For appveyor builds, json_config.h is actually generated in the "include" directory. 2017-09-17 21:35:53 -04:00
Eric Haszlakiewicz 66a77d129a Split the list of cmake headers into public and private ones, and only install the public ones. 2017-09-17 21:27:07 -04:00
Eric Haszlakiewicz 8899f3fbfb Add a "cmake ." line to the appveyor build file to try to get it working again. 2017-09-17 21:25:49 -04:00
Eric Haszlakiewicz dc79d94c38 Merge pull request #361 from schwehr/int64 
Fix double to int cast overflow in json_object_get_int64.
 2017-09-11 21:25:27 -04:00
Eric Haszlakiewicz 5454c4eaa3 Merge pull request #360 from jasonbking/master 
Use strtoll() to parse ints
 2017-09-07 22:45:48 -04:00
Eric Haszlakiewicz 4ac47a0219 Issue#353: attempt to fix or ignore a few -Wdocumentation messages from Clang. 2017-09-07 22:22:25 -04:00
Eric Haszlakiewicz edde8eff9f Issue#353: mark lh_abort as actually deprecated, not just in the docs. 2017-09-07 22:21:29 -04:00
Eric Haszlakiewicz e1561ed1df Remove the Visual Studio project files as they were out of date, and should now be generated by using cmake. 2017-09-06 23:50:03 -04:00
Eric Haszlakiewicz 7e608c5728 Issue #359: Use consistent spacing in CMakeLists.txt 2017-09-06 23:42:38 -04:00
Eric Haszlakiewicz 32f503f738 Issue #359: Don't duplicate lh_get_hash, just omit the "inline" for VS2010. 2017-09-06 23:42:30 -04:00
Eric Haszlakiewicz d58693b0f0 Merge pull request #359 from Haffon/api-0.12 
update CMakeLists.txt for compile with visual studio at least 2010
 2017-09-06 23:20:36 -04:00
Eric Haszlakiewicz 548d000891 Undo a bit of 2d1da5ab: handle per-thread formats for double serialization, even if --enable-threading wasn't specified. 2017-09-05 01:56:42 -04:00
Eric Haszlakiewicz b2afca4560 Issue #173: since some sscanf implementations return 0 for non-zero inputs, directly check for "0" in the input. 2017-09-05 01:53:13 -04:00
Eric Haszlakiewicz 2d1da5ab13 Add a --enable-threading configure option, and only use the (slower) __sync_add_and_fetch()/__sync_sub_and_fetch() function when it is specified. 2017-09-03 23:37:12 -04:00
Eric Haszlakiewicz 8777c9477a Use AC_CONFIG_MACRO_DIRS to specify path to the ax macros instead of passing -I to autoreconf in autogen.sh. 2017-09-03 22:35:58 -04:00
Eric Haszlakiewicz 5b11e9adff Explicitly check for GCC's atomic functions instead of depending on the __GNUC__ define. 
Add a comment mentioning the limitation even though the _ref_count value is hanled atomically.
 2017-09-02 14:48:17 -04:00
Eric Haszlakiewicz ab0d4dbc69 Merge branch 'pull-211' 
This is EmielBruijntes' "Atomic updates for the refcount"
 2017-09-02 13:54:15 -04:00
Eric Haszlakiewicz 95dff31951 Issue #351: don't redefine SIZE_T_MAX if it's already defined. 2017-08-30 23:35:56 -04:00
Eric Haszlakiewicz 447d67d5f3 Issue #349: none of automake's clean targets are suite for really cleaning up everything, so add a local "really-clean" target that does so. 2017-08-30 23:17:24 -04:00
Eric Haszlakiewicz 81f6edbfd5 PR#331: for Visual Studio, use a snprintf/vsnprintf wrapper that ensures the string is terminated. 2017-08-25 01:15:39 -04:00
Eric Haszlakiewicz 256ebcd827 Merge pull request #346 from schwehr/get_int 
Clamp double to int32 when narrowing in json_object_get_int.
 2017-08-21 20:50:58 -05:00