| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | Fix one more assert("!invalid cint_type") to use json_abort(...) instead. | Eric Haszlakiewicz | 2020-04-10 | 1 | -1/+1 | |
| | | ||||||
| * | Issue #568: fix the strtoll and strtoull handing so config.h ends up ↵ | Eric Haszlakiewicz | 2020-04-09 | 3 | -31/+30 | |
| | | | | | creating defines for those only when needed, which should exclude mingw environments. | |||||
| * | Remove autoconf files from .gitignore. | Eric Haszlakiewicz | 2020-04-09 | 2 | -47/+13 | |
| | | ||||||
| * | Update the oss-fuzz build script to try to get it to work with cmake. | Eric Haszlakiewicz | 2020-04-09 | 1 | -7/+29 | |
| | | ||||||
| * | Remove autoconf machinery, we're using cmake now. Update the release ↵ | Eric Haszlakiewicz | 2020-04-09 | 11 | -853/+83 | |
| | | | | | checklist to account for that, plus fill in other tasks and clean it up a bit. | |||||
| * | osx builds also need -DDISABLE_BSYMBOLIC=ON | Eric Haszlakiewicz | 2020-04-08 | 1 | -1/+5 | |
| | | ||||||
| * | I have NFC why osx fails when "set -e" is in effect, but leave it off and ↵ | Eric Haszlakiewicz | 2020-04-08 | 1 | -8/+2 | |
| | | | | | clean up the rest of the debuging code in the travis config. | |||||
| * | Not all systems (e.g. osx) have malloc.h, include stdlib.h instead. | Eric Haszlakiewicz | 2020-04-08 | 1 | -1/+1 | |
| | | ||||||
| * | Try yet again to fix the osx build, this time do set +e | Eric Haszlakiewicz | 2020-04-08 | 1 | -0/+1 | |
| | | ||||||
| * | Another attempt at debugging the travis osx build, this time just ignore errors. | Eric Haszlakiewicz | 2020-04-08 | 1 | -3/+6 | |
| | | ||||||
| * | Wait a while before exiting travis to allow output to flush. | Eric Haszlakiewicz | 2020-04-08 | 1 | -0/+2 | |
| | | ||||||
| * | Apparently cmake is already installed on travis osx builds. Try another ↵ | Eric Haszlakiewicz | 2020-04-08 | 1 | -4/+5 | |
| | | | | | approach to figure out what was failing. | |||||
| * | Install cmake on osx travis builds. s/make check/make test/ | Eric Haszlakiewicz | 2020-04-08 | 1 | -1/+4 | |
| | | ||||||
| * | Perform the travis build in a subdir, so the distcheck target works. | Eric Haszlakiewicz | 2020-04-08 | 1 | -2/+2 | |
| | | ||||||
| * | Switch travis to use cmake instead of autoconf. | Eric Haszlakiewicz | 2020-04-08 | 1 | -7/+6 | |
| | | ||||||
| * | Add includes and split off json_types.h to help ensure that headers can be ↵ | Eric Haszlakiewicz | 2020-04-06 | 8 | -60/+92 | |
| | | | | | included in any order. | |||||
| * | Don't let clang-format rearrange Windows includes, since they need to be in ↵ | Eric Haszlakiewicz | 2020-04-06 | 1 | -1/+3 | |
| | | | | | a particular order. | |||||
| * | Format random_seed.c with clang-format, with key asm sections excluded. | Eric Haszlakiewicz | 2020-04-06 | 1 | -70/+79 | |
| | | ||||||
| * | Update the style guide to mention that we're using clang-format now. | Eric Haszlakiewicz | 2020-04-06 | 1 | -15/+16 | |
| | | ||||||
| * | Merge pull request #555 from dota17/chang_format_3 | Eric Haszlakiewicz | 2020-04-03 | 55 | -3084/+3328 | |
| |\ | | | | | Format json-c with clang-format tool | |||||
| | * | clang-format the files | dota17 | 2020-04-03 | 54 | -2781/+2928 | |
| | | | ||||||
| | * | add the disabling formatting coments and adjust the partial code manuly | dota17 | 2020-04-03 | 13 | -310/+354 | |
| | | | ||||||
| | * | add options | dota17 | 2020-04-03 | 1 | -2/+52 | |
| | | | ||||||
| | * | clang-format | dota17 | 2020-04-03 | 1 | -0/+3 | |
| |/ | ||||||
| * | Merge pull request #563 from robybeen/master | Eric Haszlakiewicz | 2020-04-02 | 2 | -2/+2 | |
| |\ | | | | | Changed order of calloc args to match stdlib | |||||
| | * | Changed order of calloc args to match stdlib (2) | Robert | 2020-04-02 | 1 | -1/+1 | |
| | | | | | | | Although it is currently working, it's worth to stick with the stdlib definition to avoid further problems | |||||
| | * | Changed order of calloc args to match stdlib | Robert | 2020-04-02 | 1 | -1/+1 | |
| |/ | | | Although it is currently working, it's worth to stick with the stdlib definition to avoid further problems | |||||
| * | Merge pull request #562 from dota17/testcase_add | Eric Haszlakiewicz | 2020-04-02 | 9 | -1/+89 | |
| |\ | | | | | Bugfix and testcases supplements | |||||
| | * | add test cases | dota17 | 2020-03-31 | 9 | -1/+89 | |
| | | | ||||||
| * | | Merge pull request #561 from dota17/add_badge | Chen | 2020-03-31 | 1 | -0/+3 | |
| |\ \ | |/ |/| | add the badge in README.md and test the coveralls | |||||
| | * | add the badge in README.md and test the coveralls | dota17 | 2020-03-30 | 1 | -0/+3 | |
| |/ | ||||||
| * | Merge pull request #541 from dota17/coveralls_final | Chen | 2020-03-28 | 1 | -0/+28 | |
| |\ | | | | | add coveralls auto tool to json-c | |||||
| | * | modify the coveralls configuration file | dota17 | 2020-03-23 | 2 | -8/+18 | |
| | | | ||||||
| | * | add coveralls auto tool to json-c | dota17 | 2020-02-18 | 2 | -0/+18 | |
| | | | ||||||
| * | | Merge pull request #558 from dota17/doc_message_modify | Chen | 2020-03-20 | 1 | -1/+1 | |
| |\ \ | | | | | | | modify the doc target message | |||||
| | * | | modify the doc target message | dota17 | 2020-03-19 | 1 | -1/+1 | |
| |/ / | ||||||
| * | | Merge pull request #556 from Jehan/wip/Jehan/fix-broken-mingw-w64 | Eric Haszlakiewicz | 2020-03-16 | 3 | -5/+29 | |
| |\ \ | | | | | | | Fixes various Wreturn-type and Wimplicit-fallthrough errors on Mingw-w64 | |||||
| | * | | Fixes various Wreturn-type and Wimplicit-fallthrough errors on Mingw-w64 | Jehan | 2020-03-16 | 3 | -5/+29 | |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a recent regression since commit 6359b798479d379a3202e02c6a938d9b40c0d856 which added various assert(0) calls (often replacing return-s). With Ming-W64 compiler, json-c build was failing with various errors of the sort: > /home/jehan/dev/src/json-c/json_object.c: In function 'json_object_int_inc': > /home/jehan/dev/src/json-c/json_object.c:841:1: error: control reaches end of non-void function [-Werror=return-type] > 841 | } > | ^ > In file included from /home/jehan/dev/src/json-c/json_object.c:17: > /home/jehan/dev/src/json-c/json_object.c: In function 'json_object_get_double': > /home/jehan/.local/share/crossroad/roads/w64/json-c/include/assert.h:76:4: error: this statement may fall through [-Werror=implicit-fallthrough=] > 76 | (_assert(#_Expression,__FILE__,__LINE__),0)) > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > /home/jehan/dev/src/json-c/json_object.c:1070:7: note: in expansion of macro 'assert' > 1070 | assert(0); > | ^~~~~~ > /home/jehan/dev/src/json-c/json_object.c:1072:3: note: here > 1072 | case json_type_boolean: > | ^~~~ The problem is that Mingw-w64 does not consider assert() as a noreturn (even assert(0)), because it has to be compatible by Microsoft libraries. See the discussion here: https://sourceforge.net/p/mingw-w64/bugs/306/ Instead let's create a new json_abort() function which is basically just an abort() function with an optional message, for such cases where abortion was non-conditional (using assert() and using the assertion condition as a message here was clearly a misuse of the function). And mark json_abort() as 'noreturn', as well as 'cold' for optimization purpose (this is code we expect to never run, unless there is a bug, that is). Finally let's use this json_abort() instead of previous misused assert() calls. | |||||
| * | | Merge pull request #546 from dota17/make_unistall | Eric Haszlakiewicz | 2020-03-10 | 2 | -1/+12 | |
| |\ \ | | | | | | | Add uninstall target in cmake | |||||
| | * | | delete -r in uninstall | dota17 | 2020-03-11 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Add uninstall target in cmake | dota17 | 2020-02-27 | 2 | -1/+12 | |
| | | | | ||||||
| * | | | Merge pull request #547 from dota17/assert_test | Eric Haszlakiewicz | 2020-03-03 | 4 | -5/+13 | |
| |\ \ \ | | | | | | | | | modify json-c default build type, and fix up the assert() errors in t… | |||||
| | * | | | modify RELEASE | dota17 | 2020-03-03 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | update testcase and delete debug -O0 build | dota17 | 2020-03-02 | 3 | -9/+4 | |
| | | | | | ||||||
| | * | | | modify json-c default build type, and fix up the assert() errors in testcase | dota17 | 2020-02-29 | 4 | -5/+18 | |
| | |/ / | ||||||
| * | | | Follow up the PR#542: improve assert() calls, simplify code in ↵ | Eric Haszlakiewicz | 2020-03-02 | 1 | -21/+18 | |
| | | | | | | | | | | | | | json_object_equal(). | |||||
| * | | | Merge pull request #542 from dota17/adduint64_final | Eric Haszlakiewicz | 2020-03-01 | 23 | -50/+526 | |
| |\ \ \ | |/ / |/| | | add uint64 data to json-c | |||||
| | * | | update json_object.c and testcase, delete json_object_uint_inc() | dota17 | 2020-02-28 | 4 | -88/+19 | |
| | | | | ||||||
| | * | | modify partial functions and testcase, in order to support automatic ↵ | dota17 | 2020-02-28 | 7 | -42/+169 | |
| | | | | | | | | | | | | | conversion for int64/uint64 | |||||
| | * | | modify the json_object, replace c_int64/c_uint64 with struct{union{int64, ↵ | dota17 | 2020-02-27 | 7 | -87/+111 | |
| | | | | | | | | | | | | | uint64},...} | |||||
 |
index : delta/json-c.git | |
| github.com: json-c/json-c.git |
| summaryrefslogtreecommitdiff |