Darjan Krijan
7a9075c16b
Added test cases for spaced pretty and pretty_tab used together
6 years ago
Darjan Krijan
3943960874
Removed spaces after \n for arrays as well
6 years ago
Darjan Krijan
e8cec5c9e4
Fixed misalignment in JSON string due to space after \n being printed when choosing JSON_C_TO_STRING_SPACED together with JSON_C_TO_STRING_PRETTY in json_object_array_to_json_string
6 years ago
Eric Haszlakiewicz
ebe520e96e
Merge pull request #450 from drizt/subproject
Allow use json-c cmake as subproject
7 years ago
Ivan Romanov
ba5a02e8a9
Allow use json-c cmake as subproject
Now json-c can be bundled to any cmake-based project and used with
couple lines of code:
add_subdirectory(json-c EXCLUDE_FROM_ALL)
target_link_libraries(MyProject json-c)
7 years ago
Eric Haszlakiewicz
994e6c1f60
Re-add creation and installation of the json-c.pc file to the cmake build.
7 years ago
Eric Haszlakiewicz
705e2fd010
Merge pull request #444 from Hawk777/document-ref-count-tokener
Document refcount of json_tokener_parse_ex return
7 years ago
Christopher Head
31d4d3dee7
Document refcount of json_tokener_parse_ex return
7 years ago
Eric Haszlakiewicz
0a8ac2ed92
Merge pull request #441 from changyongGuo/c_flag_error
fix c flag loss during cmake building
7 years ago
changyong guo
08c8231cc8
fix c flag loss during cmake building
7 years ago
Eric Haszlakiewicz
bf29aa0f8c
Merge pull request #434 from unmanned-player/devel
The real CMake support
7 years ago
Eric Haszlakiewicz
91f9884591
Merge pull request #436 from jobol/master
Improve pkgconfig setting
7 years ago
Jose Bollo
d189d7b5ff
Improve pkgconfig setting
This changes allows to use #include <json-c/json.h>
instead of just #include <json.h>
This is normally possible but in some tricky case
this usage is broken without this change.
Here is the case that I encountered. I had to
compile json-c fresh version for some investigations
on newer versions. Then I installed it on my local
environment using option --prefix. After that I
had 2 versions:
- the system wide version in usual locations
/usr/lib and /usr/include
- mine in my HOME directory
Then, as I'm used to include <json-c/json.h>, the
included iheder's version was the system wide one
whereas the linked lib was mine.
Signed-off-by: Jose Bollo <jose.bollo@iot.bzh>
7 years ago
Unmanned Player
f2e991a341
The real CMake support
This patch provides a CMakeLists.txt file to build JSON-C library without relying on auto-tools support. This makes the build a bit more portable and cleaner.
It can detect headers and symbols and generate config.h header file based on those detections. It cannot yet handle ctest(1) as the testing itself depends on comparing the output against files. Testing would need some creative abuse of CMake :) This will be provided a few patches later and may possibly involve refactoring test cases.
The patch has been tested on GCC 4.8.5 (Linux), GCC 7.2.0 (MinGW) and Microsoft Visual C++ 16.0 (2010?) locally. Also, compiles correctly on Travis CI and AppVeyor without errors.
7 years ago
Eric Haszlakiewicz
2327b23d8e
Merge pull request #431 from LeSpocky/cmake
cmake: Bump required version
7 years ago
Alexander Dahl
901d59b29f
cmake: Bump required version
Using 'project(foo VERSION 1.0)' requires CMake 3.0, the VERSION option
is not part of CMake 2.8.7, see:
* https://cmake.org/cmake/help/v2.8.7/cmake.html#command:project
* https://cmake.org/cmake/help/v3.0/release/3.0.0.html#commands
The property C_STANDARD was introduced with CMake 3.1, see:
* https://cmake.org/cmake/help/v3.1/release/3.1.0.html#properties
Signed-off-by: Alexander Dahl <post@lespocky.de>
7 years ago
Eric Haszlakiewicz
3df1f98b4a
Explain why we're not setting the output name for static libraries when on Windows.
7 years ago
Eric Haszlakiewicz
a056893263
Merge pull request #415 from sgbihu/master
Resolve windows name conflict
7 years ago
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.
7 years ago
Eric Haszlakiewicz
c1c71097a1
Issue #419 : document that NULL may be passed to json_object_put().
7 years ago
Eric Haszlakiewicz
fb042f449b
Merge pull request #421 from lt-holman/install_header_file
install json_object_iterator.h header file
7 years ago
Keith Holman
37a2edf468
install json_object_iterator.h header file
When building the project using cmake then installing it. The
definitions in `json_object_iterator.h` are required but not installed
by the cmake install rule. This patch adds the `json_object_iterator.h`
file to the list of files to install.
Signed-off-by: Keith Holman <keith.holman@windriver.com>
7 years ago
Eric Haszlakiewicz
4bbc72f633
Merge pull request #420 from angelskieglazki/master
arraylist: Fixed names of parameters for callback function
7 years ago
max
7a4759f165
arraylist: Fix names of parameters for callback function
7 years ago
Eric Haszlakiewicz
4414d068b3
Always create debug info (pdb file) even for release builds.
7 years ago
Eric Haszlakiewicz
7038bb8061
Try the appveyor changes again, using %Configuration% instead of "Debug"
7 years ago
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.
7 years ago
Liang, Gao
0b3616d580
Resolve windows name conflict
1. The windows dll will output the lib and dll, and rename the static
lib will have conflict on windows.
2. Delete rename code to dismiss the conflict.
7 years ago
Eric Haszlakiewicz
c75ebe8973
Merge pull request #410 from janczer/fix-typos
Fixed typos
7 years ago
janczer
8bd62177e7
Fixed typos
7 years ago
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.
7 years ago
Eric Haszlakiewicz
da4b34355d
Add an parse test for content starting with a UTF8 BOM, which is _not_ a valid start to a JSON message.
7 years ago
Eric Haszlakiewicz
104aef0a6e
Update the change log for the 0.13.1 release.
7 years ago
Eric Haszlakiewicz
2fd95844c3
Issue #396 : check for toolchain compatibilty with _REENTRANT before adding it to CFLAGS.
7 years ago
Eric Haszlakiewicz
1e301d94be
Merge pull request #402 from derwolfe/fuzz
Add fuzzers from OSS-Fuzz
7 years ago
Chris Wolfe
1e08150838
pull in fuzzers, add CI scripts later
7 years ago
Eric Haszlakiewicz
f8eb1dec64
Merge pull request #399 from jonathan-wiens/bugfix/initialize_variable
Avoid uninitialized variable warnings
7 years ago
Jonathan Wiens
cdc4e9f64b
Avoid uninitialized variable warnings
Fix json_object_object_foreach to avoid uninitialized variable warnings
using ANSI C or MSC.
7 years ago
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.
7 years ago
Eric Haszlakiewicz
c652b6ad29
PR#394: fix breakage with VS build.
7 years ago
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).
7 years ago
Eric Haszlakiewicz
0992aac61f
Remove the TRUE and FALSE defines.
7 years ago
Eric Haszlakiewicz
cfd09c87f0
Merge pull request #393 from besser82/enhancement/unsigned_refcount
json_object_private: Use unsigned 32-bit integer type for refcount
7 years ago
Björn Esser
c233f5c05e
json_object_private: Use unsigned 32-bit integer type for refcount
7 years ago
Eric Haszlakiewicz
5ea6a05bfa
Merge pull request #389 from besser82/bugfix/invalid_free
json_object: Avoid double free (and thus a segfault) when ref_count gets < 0
7 years ago
Björn Esser
9aca3b6a08
json_object: Avoid invalid free (and thus a segfault) when ref_count gets < 0
7 years ago
Eric Haszlakiewicz
8c214902d9
Merge pull request #386 from besser82/bugfix/aclocal_amflags
Makefile: Add ACLOCAL_AMFLAGS
7 years ago
Eric Haszlakiewicz
e411b1a36e
Merge pull request #391 from rikardfalkeborn/fix-const-function-define
Fix non-GNUC define for JSON_C_CONST_FUNCTION
7 years ago
Rikard Falkeborn
84dcc01da1
Fix non-GNUC define for JSON_C_CONST_FUNCTION
7 years ago
Björn Esser
87556afe2a
Makefile: Add ACLOCAL_AMFLAGS
This is recommended by the libtool manual.
7 years ago