Petri Lehtinen
bb4f99e919
Fix clang-format version checking
5 years ago
Petri Lehtinen
f912430cda
Run clang-format with make check
5 years ago
Petri Lehtinen
a8f5fa5f5a
Tweak clang-format configuration a bit
...
Set ColumnLimit to 90, remove AllowShortCaseLabelsOnASingleLine.
5 years ago
Petri Lehtinen
7c0297abe8
Support running a specific clang-format version in CI
5 years ago
Petri Lehtinen
1a95a60f80
Run clang-format in CI, fail the build if everything's not formatted
5 years ago
Petri Lehtinen
be0fca914e
Add scripts for running clang-format
5 years ago
Petri Lehtinen
79fe8c3435
Run clang-format on *.c, *.h
5 years ago
Petri Lehtinen
7dc463ee4e
Add clang-format configuration
5 years ago
Petri Lehtinen
79075d5393
Merge pull request #498 from AllenX2018/fix-issue441
...
fix issue #441 : remove strtod definition in strconv.c
5 years ago
willson-chen
c3958a326c
remove undef __NO_ISOCEXT for strtod compatiblity
5 years ago
Petri Lehtinen
f75dc840e4
Merge pull request #499 from AllenX2018/fix-issue281
...
Add json_object_update_new, json_object_update_existing_new and json_object_update_missing_new
5 years ago
Petri Lehtinen
25e706cce7
Merge branch 'master' into fix-issue281
5 years ago
Petri Lehtinen
8b022dad76
Merge pull request #505 from AllenX2018/recursive_object_update
...
Recursive object update
5 years ago
Petri Lehtinen
0eec0327be
Merge pull request #500 from AllenX2018/fix-issue426
...
fix issue #426 : fix pipe function in MinGW
5 years ago
Petri Lehtinen
e7bed4c109
Merge pull request #501 from AllenX2018/fix-issue481
...
fix issue #481
5 years ago
Petri Lehtinen
355aa42b48
Merge pull request #502 from AllenX2018/fix-issue453
...
fix issue #453:update FindSphinx.cmake to better align with find sphinx package.
5 years ago
Petri Lehtinen
92873e9d27
Merge pull request #503 from AllenX2018/loadfd-doc
...
add note for non-blocking file descriptor used for json_loadfd
5 years ago
Petri Lehtinen
9e1c37c889
Merge pull request #506 from AllenX2018/add-json_equal-test-case
...
fix typo & add negative test case for test_equal_complex
5 years ago
allen
010092c7bd
fix typo & add negative test case for test_equal_complex
5 years ago
allen
fb602f331b
update the test case of json_object_update_recursive
5 years ago
allen
00d2d274bc
add loop check for json_object_update_recursive function
5 years ago
allen
b403bbba8d
modify some words
5 years ago
Henrique Cabral
cb4727c4a9
Add json_object_update_recursive()
...
Support merging values nested within objects. For instance, merging:
{
"foo": 1,
"bar": {
"baz": 2
}
}
with
{
"bar": {
"baz": 3
}
}
results in
{
"foo": 1,
"bar": {
"baz": 3
}
}
instead of overwriting the value for the bar key.
5 years ago
allen
a585a2778e
add note for non-blocking file descriptor used for json_loadfd
5 years ago
AllenX2018
4f26548e3a
fix issue #453
5 years ago
allen
1f889c4b60
fix issue #481
5 years ago
allen
8682f2aab3
fix issue #281
5 years ago
AllenX2018
4f3305c506
fix issue #441
...
It already has "strtod" function in stdlib.h and because __USE_MINGW_ANSI_STDIO is desperated
5 years ago
AllenX2018
78ea35c8e9
fix issue #426
5 years ago
Petri Lehtinen
c436bec682
Merge pull request #496 from grdowns/vcpkg-instructions
...
Add vcpkg installation instructions
5 years ago
grdowns
f5c0afecdb
Add vcpkg installation instructions
5 years ago
Petri Lehtinen
5371816480
Merge pull request #494 from luzpaz/typos
...
Fix various typos
5 years ago
Petri Lehtinen
09e455275c
Merge pull request #490 from AllenX2018/master
...
add loop check in json deep copy #457
5 years ago
luz.paz
3adf3e6a5a
Fix various typos
...
Found via `codespell -q 2` (v1.17.0.dev0)
5 years ago
Allen
672b6df474
Update apiref.rst
...
fix the documentation about json_dumps. refs #471
5 years ago
allen
53e9dd848f
add the loop key length macro for circular reference detect
5 years ago
allen
63fb81faa5
add loop check in json deep copy #457
5 years ago
Corey Farrell
a1f297aa83
Merge pull request #489 from AllenX2018/master
...
Update CMakeLists.txt
5 years ago
Allen
e68c5ea0b5
Update CMakeLists.txt
...
add "-Wno-format-truncation" to supress format truncation warning in cmake
5 years ago
Corey Farrell
af66d3f4c0
Merge pull request #487 from cmeister2/cmeister2/ossfuzzcorpus
...
ossfuzz: Zip up all "input" files to use as a seed corpus
5 years ago
Corey Farrell
a6f6ec1856
Merge pull request #485 from cmeister2/cmeister2/fuzzerdiags
...
ossfuzz: Improvements to json_load_dump_fuzzer
5 years ago
Max Dymond
287b5acb07
ossfuzz: Zip up all "input" files to use as a seed corpus
5 years ago
Max Dymond
3858607be0
Depending on the dump_mode byte, dump out as a string or as a callback.
5 years ago
Corey Farrell
0ed750a7ea
Merge pull request #486 from cmeister2/cmeister2/osstravis
...
Ensure OSS fuzz travis builds work for PRs
5 years ago
Max Dymond
7feae084b1
Use the correct branch for OSS Fuzz as well.
5 years ago
Max Dymond
a6f436fefc
Ensure OSS fuzz travis builds work for PRs
...
Use the correct repository for cloning when doing a push build or a
pull-request.
Only do one fuzzer build!
5 years ago
Max Dymond
66dec35c8c
ossfuzz: Improvements to json_load_dump_fuzzer
...
Add in diagnostics to json_load_dump_fuzzer so that if FUZZ_VERBOSE is
defined in the environment, additional debug information about the
current test case is output to stderr.
Replace json_dumps by json_dump_callback so that memory is not exhausted
by excessively nested json objects.
5 years ago
Corey Farrell
1ac79b2558
Merge pull request #484 from cmeister2/cmeister2/fixossafl
...
One byte fix to fix OSS Fuzz AFL support
5 years ago
Max Dymond
6e26599980
One byte fix to fix OSS Fuzz AFL support
...
"x$LIB_FUZZING_ENGINE" is not the correct filename to test for - remove
the x!
5 years ago
Corey Farrell
3bfa3f1946
Merge pull request #480 from cmeister2/cmeister2/ossfuzz
...
oss-fuzz: Create a fuzzing target for jansson
5 years ago