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
1,004 Commits 16 Branches 12 Tags
1526c84a13fa3c5408e2eaa3658fd1a0137673fb
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Hawicz 1526c84a13 Merge pull request #606 from davidjmccann/master 
Improved support for IBM operating systems
 2020-05-15 21:15:18 -04:00
Eric Haszlakiewicz d414d3eabc Issue #604: add check for __MINGW32__ in snprintf_compat.h 2020-05-13 14:53:05 +00:00
Eric Haszlakiewicz 2e71fe0963 Display a bit of info about what exactly we're benchmarking. 2020-05-11 03:05:20 +00:00
Eric Haszlakiewicz 199c52e2db Ignore the bench/work and bench/data directories. 2020-05-11 03:04:10 +00:00
Eric Hawicz 3648c3ed2c Merge pull request #602 from ploxiln/parse_uint64_errno 
fix json_parse_uint64() usage of errno
 2020-05-10 21:15:47 -04:00
Eric Haszlakiewicz 26f080997d Fix snprintf on windows problem for test4. 2020-05-10 04:04:28 +00:00
Eric Haszlakiewicz 06742d6277 Issue #600: don't rename the static library on Windows, it _needs_ to have a different name because the dll build also creates a "json-c.lib" file. 2020-05-10 03:58:51 +00:00
Eric Haszlakiewicz a59d5acfab Re-format after recent change to fix linkhash. 2020-05-10 03:58:27 +00:00
Eric Haszlakiewicz 4f43a077a4 Issue #598: avoid building static libraries twice. 2020-05-10 03:48:45 +00:00
Eric Haszlakiewicz 519dfe1591 Issue #599: Fix the backwards check in lh_table_insert_w_hash() that was preventing adding more than 11 objects. 
Add a test to check for this too.
 2020-05-10 03:36:05 +00:00
Eric Hawicz 45b6416652 Merge branch 'master' of https://github.com/json-c/json-c 2020-05-08 22:25:15 -04:00
Eric Hawicz abc9a0731b Merge pull request #597 from ploxiln/json_parse_usage 
json_parse demo: fix and use usage() function
 2020-05-08 22:23:28 -04:00
Eric Hawicz 22870ac2bd Merge pull request #595 from dota17/static_shared 
Support to build both static and shared libraries
 2020-05-07 23:23:15 -04:00
Eric Hawicz 31243e4d12 Merge pull request #592 from stoeckmann/oob 
Prevent out of boundary write on malicious input
 2020-05-06 23:31:15 -04:00
Eric Haszlakiewicz 8e3d3d5544 Make the benchmark work with pre-cmake versions of json-c. Fetch a few more data files. 2020-05-04 03:40:40 +00:00
Eric Haszlakiewicz c66e7377f3 In jc-bench.sh, decode the --before and --after args. Use a separate data dir to avoid re-downloading files when the work dir is cleared. 2020-05-04 03:24:39 +00:00
Eric Haszlakiewicz 8086314026 Issue #589: drop the rdrand test loops to just 3, tweak comments and add some links to bug reports, and decrease the nesting level of the has_rdrand() function. 2020-05-04 01:33:15 +00:00
Eric Hawicz a555d0e2f2 Merge pull request #589 from Xyene/detect-broken-rdrand 
Detect broken RDRAND during initialization
 2020-05-03 21:13:48 -04:00
Eric Hawicz 9b64c3e347 Fix printf format issues in apps/json_parse, and actually call the usage() function. 2020-05-03 14:55:12 -04:00
Eric Hawicz ee90110f9b Merge pull request #590 from Xyene/fix-cpuid-segfault 
Fix segmentation fault in CPUID check
 2020-05-03 14:52:31 -04:00
Eric Haszlakiewicz f9605e9072 Fix cmake-configure to accept "--prefix=<foo>" in addition to "--prefix <foo>" (see also Issue #591) 2020-05-03 03:50:50 +00:00
Eric Haszlakiewicz 1059007024 Add an initial version of a benchmarking harness for json-c, to be able to more easily compare the performance of different library versions. 2020-04-27 04:00:00 +00:00
Eric Haszlakiewicz d9981f67dd Extend the CMakeLists.txt in the apps directory to be usable as a standalone build, to link against other versions of json-c. 
Tweak json_parse.c slightly to allow it to build against older json-c versions.
 2020-04-26 04:02:36 +00:00
Eric Haszlakiewicz 00272292a7 The json_parse command line app doesn't build on Windows, disable it. 2020-04-21 21:35:41 +00:00
Eric Haszlakiewicz 55d053118e Add an apps directory, and a json_parse program to parse an input file and report on memory usage. 
This is intended to provide a way, during development, to test out the memory
and performance impacts of a change.
 2020-04-21 03:57:56 +00:00
Eric Haszlakiewicz f6f76f9430 Add a JSON_TOKENER_ALLOW_TRAILING_CHARS flag for json_tokener_set_flags() to allow multiple objects to be parsed from input even when JSON_TOKENER_STRICT is set. 2020-04-21 03:53:44 +00:00
Eric Haszlakiewicz 05623b3a2e Add an tok_flags field to explicitly specify tokener flags in test_parse and eliminate the previous bogus calls to json_tokener_set_flags() 2020-04-21 03:53:44 +00:00
Eric Haszlakiewicz fa6bc1e2d7 Issue #471: always create directories with mode 0755, regardless of umask. 2020-04-21 03:19:17 +00:00
Eric Haszlakiewicz 8b511c402b Issue #585: don't install config.h 2020-04-21 01:13:21 +00:00
Eric Haszlakiewicz ba4527904a Add a few missing git commands to the release checklist, and change the S3 storage to "Standard", since it's actually (barely) cheaper than "Reduced Redundancy" now. 2020-04-19 04:17:29 +00:00
Eric Haszlakiewicz 2babb5b780 Update the master branch to version 0.0.14.99 2020-04-19 03:57:08 +00:00
Eric Haszlakiewicz 31ab57ca8b Fill in the ChangeLog for the upcoming 0.14 release. 2020-04-19 01:31:48 +00:00
Eric Haszlakiewicz 9ed00a694b Fill in a few more pre-release steps to match what we've done for the 0.14 release. 
Move the list of contributors to the AUTHORS file.
 2020-04-19 01:28:24 +00:00
Eric Haszlakiewicz 4badbe9c20 Rewrite the issued_closed_for_* files so they display a bit nicer. 2020-04-18 03:22:52 +00:00
Eric Haszlakiewicz 0a95f98b8d Explicitly mark several things in json_tokener deprecated. 2020-04-18 02:42:46 +00:00
Eric Haszlakiewicz ecb9354bb1 Re-do clang-format. 2020-04-18 02:14:13 +00:00
Eric Haszlakiewicz 23ddcbd4da Make json_abort() internal to json_object.c 2020-04-18 02:05:37 +00:00
Eric Haszlakiewicz 5cc11289b4 Make json_tokener_validate_utf8() internal to json_tokener.c, and improve the docs a bit. 2020-04-18 02:02:06 +00:00
Eric Haszlakiewicz 4dc0f1718e Merge pull request #582 from dota17/list_closed_issue_pr 
add the list of issues& prs closed
 2020-04-17 13:32:17 -04:00
Eric Haszlakiewicz a9114392b4 Merge pull request #524 from dota17/addTestCase_obj_token 
Increase coverage
 2020-04-15 23:35:21 -04:00
Eric Haszlakiewicz 04bb0fca73 Merge pull request #581 from Jehan/wip/Jehan/no-strict-prototypes-windows 
CMakeLists: do not enforce strict prototypes on Windows.
 2020-04-15 23:32:59 -04:00
Eric Haszlakiewicz 7fb8d56458 Merge pull request #580 from besser82/topic/besser82/fix_cmake_tests 
Fix CMake tests for enforced strict prototypes.
 2020-04-14 15:17:21 -04:00
Eric Haszlakiewicz ab5425a6a6 Merge pull request #527 from dota17/arraylist_test 
Arraylist testcase
 2020-04-14 10:28:16 -04:00
Eric Haszlakiewicz 511edb51a4 Merge pull request #579 from besser82/topic/besser82/strict-prototypes 
Enforce strict prototypes.
 2020-04-14 10:25:13 -04:00
Eric Haszlakiewicz 4742a2ab1d Merge pull request #578 from besser82/topic/besser82/pkgconfig_install 
CMake: Install pkgconfig file in proper location by default
 2020-04-12 20:52:01 -04:00
Eric Haszlakiewicz 8269f90956 Merge pull request #577 from besser82/topic/besser82/json_c_version_test_verbose_on_fail 
Be verbose on failing json_c_version test.
 2020-04-11 22:35:40 -04:00
Eric Haszlakiewicz c58d56ab7c Merge pull request #576 from besser82/topic/besser82/increase_coverage 
Test coverage for json_c_version.
 2020-04-11 14:45:45 -04:00
Eric Haszlakiewicz d52f1ff2c1 Merge pull request #575 from besser82/topic/besser82/cosmetics 
Small cosmetics.
 2020-04-11 14:18:37 -04:00
Eric Haszlakiewicz 270dc2f999 Update README.md to remove autoconf instructions in favor of cmake. 2020-04-11 03:24:51 +00:00
Eric Haszlakiewicz 0734c5303d Merge pull request #572 from besser82/topic/besser82/cmake_fixes 
Small fixes to CMakeLists
 2020-04-10 22:08:27 -04:00
Eric Haszlakiewicz 61392c867f List the set of contributors since the 0.13 branch 2020-04-10 02:11:48 +00:00
Eric Haszlakiewicz 0a070ef312 Fix one more assert("!invalid cint_type") to use json_abort(...) instead. 2020-04-10 01:26:04 +00:00
Eric Haszlakiewicz 545464322b Issue #568: fix the strtoll and strtoull handing so config.h ends up creating defines for those only when needed, which should exclude mingw environments. 2020-04-09 20:58:28 +00:00
Eric Haszlakiewicz b64bdfe381 Remove autoconf files from .gitignore. 2020-04-09 02:55:21 +00:00
Eric Haszlakiewicz 0c60125211 Update the oss-fuzz build script to try to get it to work with cmake. 2020-04-09 02:35:41 +00:00
Eric Haszlakiewicz 95737df9d4 Remove autoconf machinery, we're using cmake now. Update the release checklist to account for that, plus fill in other tasks and clean it up a bit. 2020-04-09 02:15:31 +00:00
Eric Haszlakiewicz 96ab2f6596 osx builds also need -DDISABLE_BSYMBOLIC=ON 2020-04-08 03:04:27 +00:00
Eric Haszlakiewicz 96bb334650 I have NFC why osx fails when "set -e" is in effect, but leave it off and clean up the rest of the debuging code in the travis config. 2020-04-08 02:54:10 +00:00
Eric Haszlakiewicz f357081b57 Not all systems (e.g. osx) have malloc.h, include stdlib.h instead. 2020-04-08 02:53:48 +00:00
Eric Haszlakiewicz 2782a6b62c Try yet again to fix the osx build, this time do set +e 2020-04-08 02:39:03 +00:00
Eric Haszlakiewicz a86ae1df9a Another attempt at debugging the travis osx build, this time just ignore errors. 2020-04-08 02:28:02 +00:00
Eric Haszlakiewicz 829e0829dd Wait a while before exiting travis to allow output to flush. 2020-04-08 02:17:14 +00:00
Eric Haszlakiewicz cf8421c36d Apparently cmake is already installed on travis osx builds. Try another approach to figure out what was failing. 2020-04-08 02:02:25 +00:00
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