Tobias Nießen
928fa96db7
Fix typo in README
3 years ago
Eric Haszlakiewicz
a5c2e11460
Cause the cmake include dirs to also have ${CMAKE_INSTALL_INCLUDEDIR}/json-c, so downstream packages that use cmake to link against json-c can choose whether to include headers as just e.g. #include <json_object.h>, if they care to do so.
Update the README to better explain this, and make a few other tweaks.
3 years ago
Eric Haszlakiewicz
2d2382d709
Add linkhash accessor functions (lh_table_head(), lh_entry_next(), etc...) to pave the way for making the lh_table and lh_entry structure opaque in the future.
Update the docs to mark all members of those structures deprecated, and
suggest what to use instead.
3 years ago
Eric Haszlakiewicz
320548caf6
Drop the REFCOUNT_DEBUG code, it hasn't been used in ages.
3 years ago
Eric Hawicz
9a90b8477b
Merge pull request #734 from json-c/newer-appveyor
Newer appveyor config for VS2022 etc...
Update the appveyor config to specify "image" instead of just "os", and build for VS2017, VS2019 and VS2022.
3 years ago
Eric Haszlakiewicz
1cb56e705f
Put the most recent image first in appveyor builds.
3 years ago
Eric Haszlakiewicz
1763edaba3
Skip most "Release" builds. s/b_config/CONFIGURATION/ to fix artifact creation.
3 years ago
Eric Haszlakiewicz
a5fed59756
There doesn't seem to be a way to extend the appveyor build matrix for just one image, so instead list a whole bunch of excluded builds.
3 years ago
Eric Haszlakiewicz
0910e18bbd
Use the newer appveyor images to build for VS2017 and VS2019. Trim the number of builds we do.
3 years ago
Eric Haszlakiewicz
f1fb9abf14
Note the need to also set CTEST_OUTPUT_ON_FAILURE to get test output
3 years ago
Eric Hawicz
42aa6f7257
Merge pull request #732 from DiracResearch/fix/static_include_dirs
Fix/static include dirs
3 years ago
Robert Bielik
286b4fdd27
Fix uninitialized value error for clang-8 msan
3 years ago
Robert Bielik
a66a6cc51b
Fix for clang ub sanitizer
3 years ago
Robert Bielik
21f767f63f
Add target include dirs for static library as well
3 years ago
Eric Hawicz
9b0fb2b33e
Merge pull request #727 from jobol/propo2
Really use prefix JSON_C_OBJECT_ADD_
4 years ago
José Bollo
8bf3b45a29
Really use prefix JSON_C_OBJECT_ADD_*
This change introduces JSON_C_OBJECT_ADD_CONSTANT_KEY
as a replacement of JSON_C_OBJECT_KEY_IS_CONSTANT.
The description of json_object_object_add_ex tells to
look at the flags JSON_C_OBJECT_ADD_* but it is not
for JSON_C_OBJECT_KEY_IS_CONSTANT.
From the point of vue of a developper using json-c,
the function json_object_object_add_ex is mainly used,
not the hash facility, it seems more natural to provide
a regular naming of prefix JSON_C_OBJECT_ADD_CONSTANT_KEY.
4 years ago
Eric Hawicz
05c5d15075
Merge pull request #729 from DeX77/patch-1
* don't assume includedir
4 years ago
DeX77
d6d4b71d7d
* don't assume includedir
This change syncs the public header include install location with what gets written into pkgconfig file.
4 years ago
Eric Hawicz
382f9462c2
Merge pull request #726 from leongross/fix/test-cmake3.1
fix cmake version for tests
4 years ago
Leon Gross
8be2ffdcd7
fix cmake version for tests
4 years ago
Eric Hawicz
4fc44f32df
Merge pull request #722 from imaami/fix-json_tokener_new_ex-use-after-free
Fix use-after-free in json_tokener_new_ex()
4 years ago
Juuso Alasuutari
9361d8d3a8
Fix use-after-free in json_tokener_new_ex()
The failure path taken in the event of printbuf_new() returning NULL
calls free() on tok->stack after already having freed tok. Swap the
order of the two calls to fix an obvious memory access violation.
Fixes: bcb6d7d347
("Handle allocation failure in json_tokener_new_ex")
Signed-off-by: Juuso Alasuutari <juuso.alasuutari@gmail.com>
4 years ago
Eric Hawicz
dc1ef7d566
Merge pull request #718 from Pawday/master
CMake create uninstall target if unix generator is used
4 years ago
Pawday
e91e4cc9fb
Setted cmake "uninstall" target to exist in unix like operating systems only
4 years ago
Eric Haszlakiewicz
f61f1a7a91
Add workaround for Visual Studio not knowing about "inline".
4 years ago
Eric Haszlakiewicz
db6a6cc2b2
Switch the Travis build to use osx_image: xcode12.5, in an attempt to avoid timeouts with Homebrew.
4 years ago
Eric Haszlakiewicz
6a0df2609e
Merge some old work to include (some of) PR #464 into the current master branch.
4 years ago
Eric Haszlakiewicz
8c727e5ce1
Only define an "uninstall" target if it's not already defined (e.g. by projects that include json-c)
4 years ago
Eric Hawicz
be9671e48a
Merge pull request #714 from Hex052/clang-format_AfterCaseLabel
Add AfterCaseLabel to .clang-format
4 years ago
Hex052
9dde931a1c
Add AfterCaseLabel to .clang-format
This is to fix the behavior that might've changed between older versions of clang-format, I'm not sure.
Version 10 tries to put the bracket on the same line as case without this.
4 years ago
Eric Haszlakiewicz
75bf657cc2
If inttypes.h is present, use it, even on Windows.
4 years ago
Eric Haszlakiewicz
9ca50cf2f8
Issue #709 : adjust some include guards to be a bit more json-c specific.
4 years ago
Eric Hawicz
0b7e78c309
Merge pull request #706 from davidjmccann/master
Check __STDC_VERSION__ is defined before checking its value
4 years ago
David McCann
00098efc96
Merge branch 'json-c:master' into master
4 years ago
David McCann
9b53c92ea3
Check __STDC_VERSION__ is defined before checking its value
Prevent an undef warning regarding __STDC_VERSION__ by checking whether it is defined before checking its value.
4 years ago
Eric Hawicz
cd7109f767
Merge pull request #696 from ssrlive/master
To avoid target exe file export JSON functions.
4 years ago
Eric Hawicz
78e390a261
Merge pull request #701 from commodo/configurable-opts
[RFC] json_pointer: allow the feature to be disabled
4 years ago
Alexandru Ardelean
8abeebc9b2
json_pointer: allow the feature to be disabled
Some users may not want to included it in their build/system. So allow a
cmake symbol to disable it.
A user can do 'cmake -DDISABLE_JSON_POINTER=ON <json_c_root_dir>' and
disable the json_pointer functionality. That saves about 17 KB (on an
x86_64) machine. This may be useful on smaller embedded systems; even
though the saving would be fewer kilobytes.
One thing that also needs to change a bit, is that the 'json.h' be
autogenerated via cmake, in order to conditionally include that
"json_pointer.h" file.
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
4 years ago
Alexandru Ardelean
1f8b64f62c
tests: CMakeLists.txt: move test names to variable
The intent is to be able to disable some features that get built into the
library. When we do that, we also need to disable some tests.
It's easier when adjusting a variable that contains the list of test names,
versus modifying the list in the foreach() statement.
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
4 years ago
Eric Hawicz
94909840be
Merge pull request #700 from Philosoph228/werror-fix
Fix unused variable for Win32 build in random_seed.c
4 years ago
Philosoph228
9c0565100a
random_seed: fix unused variable for win32 build
4 years ago
ssrlive
ba181548bc
To avoid target exe file export JSON functions.
4 years ago
Eric Haszlakiewicz
041cef434a
Add a DISABLE_EXTRA_LIBS option to skip using libbsd, per @neheb's request on issue #692/commit 0f61f692
.
4 years ago
Eric Haszlakiewicz
f787810890
If arc4random is used, don't bother compiling in the other fallback methods since they'll never be used. Fixes PR#695 about unreachable code too.
4 years ago
Eric Hawicz
7c859c54e4
Merge pull request #694 from ihsinme/patch-1
fix invalid unsigned arithmetic.
4 years ago
ihsinme
c456963110
Update json_object.c
4 years ago
Eric Haszlakiewicz
0f61f6921b
Iesue #692 : use arc4random() if it's available (in libc on BSD systems, and libbsd on Linux).
4 years ago
Eric Haszlakiewicz
69d650528d
Keep the doc directory in the nodoc release tarball, just exclude its contents.
4 years ago
Eric Hawicz
4754f47434
Merge pull request #674 from ploxiln/random_seed_err_continue
random_seed: on error, continue to next method
4 years ago
Eric Hawicz
1fcb9e476b
Merge pull request #689 from neheb/patch-1
fix compilation with clang
4 years ago