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
903 Commits 16 Branches 12 Tags
fb0b653612dcad7e61a0c167bde55a9c329166bf
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Haszlakiewicz fb0b653612 Install cmake on osx travis builds. s/make check/make test/ 2020-04-08 01:45:49 +00:00
Eric Haszlakiewicz a3b82cbc77 Perform the travis build in a subdir, so the distcheck target works. 2020-04-08 01:34:22 +00:00
Eric Haszlakiewicz 677a8ccf44 Switch travis to use cmake instead of autoconf. 2020-04-08 01:21:11 +00:00
Eric Haszlakiewicz 19bbf2c069 Add includes and split off json_types.h to help ensure that headers can be included in any order. 2020-04-06 13:55:27 +00:00
Eric Haszlakiewicz 5e19c26cae Don't let clang-format rearrange Windows includes, since they need to be in a particular order. 2020-04-06 02:47:34 +00:00
Eric Haszlakiewicz 9acc4e9d71 Format random_seed.c with clang-format, with key asm sections excluded. 2020-04-06 01:52:28 +00:00
Eric Haszlakiewicz 9a494081cb Update the style guide to mention that we're using clang-format now. 2020-04-06 01:49:14 +00:00
Eric Haszlakiewicz 31f1ab2be1 Merge pull request #555 from dota17/chang_format_3 
Format json-c with clang-format tool
 2020-04-03 00:13:34 -04:00
Eric Haszlakiewicz ed54353d84 Merge pull request #563 from robybeen/master 
Changed order of calloc args to match stdlib
 2020-04-02 22:35:21 -04:00
Eric Haszlakiewicz 6afcf1606b Merge pull request #562 from dota17/testcase_add 
Bugfix and testcases supplements
 2020-04-02 11:23:39 -04:00
Eric Haszlakiewicz a06339215e Merge pull request #556 from Jehan/wip/Jehan/fix-broken-mingw-w64 
Fixes various Wreturn-type and Wimplicit-fallthrough errors on Mingw-w64
 2020-03-16 21:24:14 -05:00
Eric Haszlakiewicz e94eb90f9f Merge pull request #546 from dota17/make_unistall 
Add uninstall target in cmake
 2020-03-10 22:12:13 -05:00
Eric Haszlakiewicz a8c9284f06 Merge pull request #547 from dota17/assert_test 
modify json-c default build type, and fix up the assert() errors in t…
 2020-03-03 07:54:21 -06:00
Eric Haszlakiewicz b3296e778f Follow up the PR#542: improve assert() calls, simplify code in json_object_equal(). 2020-03-02 02:08:49 +00:00
Eric Haszlakiewicz 737aee40c4 Merge pull request #542 from dota17/adduint64_final 
add uint64 data to json-c
 2020-03-01 08:51:26 -05:00
Eric Haszlakiewicz 30e00cf757 Merge pull request #545 from dota17/make_doc 
add doc target in cmake
 2020-02-26 20:56:22 -05:00
Eric Haszlakiewicz 5a2b9139f9 Merge pull request #544 from dota17/distcheck 
Increase distcheck target in cmake
 2020-02-25 21:48:35 -05:00
Eric Haszlakiewicz a0129c9761 Merge pull request #543 from dota17/readme 
Readme
 2020-02-25 21:38:18 -05:00
Eric Haszlakiewicz 518f337ce8 Issue #539: use a internal-only serializer function in json_object_new_double_s() to avoid potential conflicts with user code that uses the json_object_userdata_to_json_string serializer. Also, document the serializer-resetting behavior of json_object_set_double(). 2020-02-14 03:48:02 +00:00
Eric Haszlakiewicz 4bf7ffa984 Issue #539: be sure to clean up at the end of test_set_value. 2020-02-14 03:25:46 +00:00
Eric Haszlakiewicz ae13ca524a Issue #539: reset the serializer when json_object_set_double() is called and the current serializer is the one that json_object_new_double_s() used. 2020-02-13 03:11:10 +00:00
Eric Haszlakiewicz 0ffdbb2395 Merge pull request #531 from dota17/utf8test 
validate utf-8 string
 2020-02-05 21:56:06 -05:00
Eric Haszlakiewicz 1934eddf29 Merge pull request #536 from dota17/new_null 
add json_object_new_null()
 2020-01-21 23:23:53 -05:00
Eric Haszlakiewicz 360d28b961 Merge pull request #533 from sunpoet/master 
Fix "make check"
 2020-01-12 22:42:02 -05:00
Eric Haszlakiewicz e651e96a5b Merge pull request #526 from dota17/addTestCase_printbuf 
Increased the test coverage of printbuf.c 82% to 92%.
 2020-01-03 08:32:53 -05:00
Eric Haszlakiewicz a255510cca Merge pull request #525 from dota17/addPointerTestcase 
update pointer test case
 2020-01-03 08:31:41 -05:00
Eric Haszlakiewicz 0421772bbc Merge pull request #523 from dota17/updatetestcase 
update tsetcase for tokener_c
 2020-01-02 22:22:57 -05:00
Eric Haszlakiewicz 4bfed6eb2f Merge pull request #522 from dota17/addVisitTestcase 
update json_visit testcase
 2020-01-02 22:22:09 -05:00
Eric Haszlakiewicz ee34939e74 Merge pull request #519 from dota17/addTestCase_obj_token 
Add test case obj token
 2019-12-29 16:02:04 -05:00
Eric Haszlakiewicz d6b968dff7 Merge pull request #512 from JaapKeuter/cmake_test 
Properly append to CMAKE_C_FLAGS string
 2019-12-12 22:30:15 -05:00
Eric Haszlakiewicz 6c55f65d07 Set cmake policy CMP0075, to have check_include_file use the value of CMAKE_REQUIRED_LIBRARIES (currently, adds -lm). See issue #510. 2019-12-06 00:15:14 -05:00
Eric Haszlakiewicz 0819a55ffb Undefine NDEBUG for tests - cmake version. See issue #501. 2019-12-05 23:18:59 -05:00
Eric Haszlakiewicz 37b4da6b92 Merge pull request #501 from andy5995/iss_406-2 
undefine NDEBUG for tests
 2019-12-05 23:18:46 -05:00
Eric Haszlakiewicz 581b94b3bd Add a shim script to ease shift from autoconf to cmake. 2019-12-01 23:42:40 -05:00
Eric Haszlakiewicz 11a638048d Add a few missing features to the cmake setup that are present in configure.ac: 
Include all compiler warnings, and provide DISABLE_WERROR to make them not be errors.
 Define _REENTRANT, if setting it works.
 Set -Bsymbolic-functions, and provide DISABLE_BSYMBOLIC to turn that off.
 Implement the check for HAS_GNU_WARNING_LONG
 2019-11-26 23:02:15 -05:00
Eric Haszlakiewicz a92e6d2c28 Set the soversion in the cmake built library, and arrange for the file name to be generated appropriately too. 2019-11-25 23:26:48 -05:00
Eric Haszlakiewicz 41f434e89f Fix test_util_file for VS2013 too, but skip all the tests for anything older than that because the limitations are too inconvenient. 2019-11-23 23:55:04 -05:00
Eric Haszlakiewicz b99be9cf4e Fix up the test_util_file test for builds on Windows VS2015. 2019-11-23 23:14:24 -05:00
Eric Haszlakiewicz 7f30afc6e5 Fix some Windows compile issues, add JSON_EXPORT's, fix bogus character escapes, define __func__ and omit unistd.h if needed. 2019-11-23 20:31:14 -05:00
Eric Haszlakiewicz f19abcf981 Get the cmake build a bit closer to the autoconf one: include json_visit.h, and fix the version stamped in json-c.pc. 2019-11-23 15:34:23 -05:00
Eric Haszlakiewicz bdaff94e9a Build and run the tests as part of the cmake build. 2019-11-23 15:15:48 -05:00
Eric Haszlakiewicz 25aedddcdf Fix memory leaks in test_double_serializer, and make sure all tests return 0 at the end of main(). 2019-11-23 12:05:28 -05:00
Eric Haszlakiewicz 3d3b014971 Add a quick way (JSONC_TEST_TRACE=1) to turn on shell tracing in tests. 2019-11-23 12:03:27 -05:00
Eric Haszlakiewicz b1ad748842 Extend test_double_serializer to check NaN and Infinity handling. 2019-11-22 22:56:33 -05:00
Eric Haszlakiewicz af8dd4a307 Define vars earlier to fix old Windows builds. 2019-11-10 20:35:30 -05:00
Eric Haszlakiewicz baed9983b3 Add a json_object_from_fd_ex() function, to allow the max nesting depth to be specified. 2019-11-10 00:14:44 -05:00
Eric Haszlakiewicz ac26ea9c5b Add a test for serializing the double value -1.0. 2019-11-10 00:13:00 -05:00
Eric Haszlakiewicz ddd049045d Merge pull request #505 from grdowns/vcpkg-instructions 
Add vcpkg installation instructions
 2019-09-26 22:23:52 -04:00
Eric Haszlakiewicz eae040a84a Issue #488: use JSON_EXPORT on functions so they are properly exported on Windows. 2019-09-08 22:42:36 -04:00
Eric Haszlakiewicz 374ffe87c6 Issue #463: fix newlocale() call to use LC_NUMERIC_MASK instead of LC_NUMERIC, and remove incorrect comment. 
The second call to newlocale() with LC_TIME accidentally made things
 work because LC_TIME == LC_NUMERIC_MASK on some platforms.
 2019-09-08 22:27:30 -04:00
Eric Haszlakiewicz 05b41b159e Add a json_tokener_get_parse_end() function to replace direct access of tok->char_offset. 2019-09-08 21:35:37 -04:00
Eric Haszlakiewicz 087534c030 Minor cleanup of includes in a couple of tests. 2019-09-08 21:34:13 -04:00
Eric Haszlakiewicz d0b87ee87b Add an explicit cast to double to squash a -Wimplicit-int-float-conversion warning. 
Though we will no longer be comparing exactly against INT64_MAX, this is ok
because any value of that magnitude stored in a double will *also* have been
rounded up, so the comparison will work appropriately.
 2019-08-12 00:30:45 +00:00
Eric Haszlakiewicz a91aa5e35d Merge pull request #499 from andy5995/travis_valgrind 
.travis.yml:test on more recent clang and gcc versions
 2019-07-27 09:29:57 -04:00
Eric Haszlakiewicz c8e1b59ae5 Merge pull request #495 from andy5995/README_typos 
README.md:fix 2 typos
 2019-07-26 23:08:11 -04:00
Eric Haszlakiewicz 4a94ddbd8b Merge pull request #500 from andy5995/add_missing_test_deps 
test/Makefile.am:add missing deps for test1 and test2
 2019-07-26 09:48:34 -04:00
Eric Haszlakiewicz 68abf12afa Issue #498: Fix a memory leak bug introduced in test_double_serializer in 485f2a02 by adding a json_object_put call. 2019-07-26 03:35:38 +00:00
Eric Haszlakiewicz 48984dbd42 Merge pull request #496 from andy5995/pointer_doc 
json_pointer.h:suggest minor grammar improvement for pointer doc
 2019-07-25 22:58:22 -04:00
Eric Haszlakiewicz 07ea04e651 Merge pull request #491 from ploxiln/disable_werror 
build: add option --disable-werror to configure
 2019-06-09 14:05:46 -04:00
Eric Haszlakiewicz 2b1903cc69 Merge pull request #485 from myd7349/fix-cmake-module 
Install CMake module files
 2019-05-30 22:38:29 -04:00
Eric Haszlakiewicz 485f2a02c7 Issue #486: append a missing ".0" to negative double values too. 2019-05-28 02:44:22 +00:00
Eric Haszlakiewicz 3e81b4abe3 Merge pull request #474 from Jehan/fix-pc-file-cmake 
Installation directories empty with CMake in pkg-config.
 2019-01-26 10:55:50 -05:00
Eric Haszlakiewicz f1713b3f62 Merge pull request #473 from besser82/fixup/docs_utf8 
Convert ChangeLog to valid UTF-8 encoding.
 2019-01-23 22:47:27 -05:00
Eric Haszlakiewicz 39c9fa0a2b Merge pull request #468 from rkalidas/compiler-fixes 
Fix compiler warnings
 2018-12-19 11:09:01 -05:00
Eric Haszlakiewicz 6460446aa6 Switch to building a dynamic lib by default. Tweak language in the README.md slightly. Inspired by PR#452. 2018-12-11 20:59:08 -05:00
Eric Haszlakiewicz ee4691c9fb Merge pull request #453 from darjankrijan/master 
Fixed misalignment in JSON string due to space after \n being printed...
 2018-12-11 20:17:43 -05:00
Eric Haszlakiewicz 240627f260 Merge pull request #454 from ramiropolla/json_object_private 
json_object_private: save 8 bytes in struct json_object in 64-bit arc…
 2018-11-30 09:49:35 -05:00
Eric Haszlakiewicz 745cadc944 Merge pull request #461 from andy5995/issue_422 
json_object.c:set errno in json_object_get_double()
 2018-11-28 20:39:42 -05:00
Eric Haszlakiewicz 83cb93b7ae Merge pull request #462 from andy5995/issue_460 
json_object.h:document json_object_new_string_len()
 2018-11-28 20:39:13 -05:00
Eric Haszlakiewicz 7539ab2d2e Merge pull request #459 from andy5995/issue_438 
README.html:fix link to Doxygen docs, remove WIN32 link
 2018-11-25 21:19:02 -05:00
Eric Haszlakiewicz 753de5a5a9 Merge pull request #458 from andy5995/README_files_link 
README.md:fix dead "file.html" link
 2018-11-25 21:17:40 -05:00
Eric Haszlakiewicz 80bf857b27 Merge pull request #457 from andy5995/gitignore_build 
.gitignore:add build directory
 2018-11-25 21:14:34 -05:00
Eric Haszlakiewicz aa831c7960 Merge pull request #456 from andy5995/style_perms 
STYLE.txt:remove executable permissions
 2018-11-25 21:14:14 -05:00
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