Eric Haszlakiewicz
ecdc14f535
Add a json_c_visit() function to provide a way to iterate over a tree of json-c objects.
9 years ago
Eric Haszlakiewicz
7e12b9f47c
Fix broken key-order test in test_compare.
9 years ago
Eric Haszlakiewicz
80150a18d3
Merge pull request #272 from sgerbino/master
Allows for compilation with CMake on macOS
9 years ago
Eric Haszlakiewicz
818156f6f7
Merge pull request #277 from ALLTERCO/json_object_set_xxx
Json object set xxx
9 years ago
Stoian Ivanov
be63ba99ca
try restore windows automated builds
9 years ago
Stoian Ivanov
a26305d428
fix compiler warning for int sizes
9 years ago
Stoian Ivanov
e518b22b72
string set and tests
9 years ago
Stoian Ivanov
9a313f767f
gitignore test; add double value set checks in test
9 years ago
Stoian Ivanov
6a0667567d
some simple tests
9 years ago
Eric Haszlakiewicz
36a28fcb0c
Issue #275 : fix out of bounds read when handling unicode surrogate pairs.
9 years ago
Stoian Ivanov
05f025c075
some basic set
9 years ago
Eric Haszlakiewicz
5fd99e62ed
Merge pull request #273 from konoal/master
fixed wrong object name in json_object_all_values_equal
9 years ago
Eric Haszlakiewicz
5653bc61a4
Merge pull request #274 from pepevel/master
Support for 64 bit pointers on Windows
9 years ago
pepevel
0df34b4c96
Support for 64 bit pointers on Windows
9 years ago
Alexey Konovalov
b2fbf93df0
fixed wrong object name in json_object_all_values_equal
9 years ago
Steve Gerbino
c5c93724fe
Changed CMake variables and adding output for debugging
9 years ago
Steve Gerbino
0c749d96ea
Target C99 standards to get rid of warnings
9 years ago
Steve Gerbino
928858457b
Modified the execute_process commands
9 years ago
Steve Gerbino
bdead39f63
Changed PROJECT_SOURCE_DIR to CMAKE_CURRENT_SOURCE_DIR to fix building when used as external project
9 years ago
Steve Gerbino
702b42eaf3
Modified CMakeLists.txt to use autotools to generate configuration for Unix systems
9 years ago
Steve Gerbino
43afcc0d99
Lowered CMake required version so that Travis CI is able to build, moved include folder to include/json-c to match the behavior of autotools
9 years ago
Steve Gerbino
fe941a26a3
Trailing slash seems necessary in the install command to get contents
9 years ago
Steve Gerbino
ab7c09dc8e
Forget DESTINATION in CMake install command
9 years ago
Steve Gerbino
34b4a490b1
We need to also install the generated configuration files
9 years ago
Steve Gerbino
989e39d995
Fixed typo in CMakeList.txt FILES_MATCHING
9 years ago
Steve Gerbino
e2ee223dc2
Added install instructions for CMake
9 years ago
Steve Gerbino
69f018c49e
Resolves json-c/json-c#271 by adding MacOS configuration files and modifies CMakeLists.txt to use them
9 years ago
Stoian Ivanov
fae09456ae
json_object_set_boolean for upstream style check
9 years ago
Eric Haszlakiewicz
9f9c3326fe
Merge pull request #267 from sixlettervariables/patch-1
Removes me as Win32 maintainer, because I'm not.
9 years ago
Christopher Watford
21e5ffbcf8
Removes me as a maintainer, because I'm not.
Updates README-WIN32.html to remove my status as a maintainer (I'm not). Also removes ancient porting notes and adds a reference to json_config.h.win32 which is where most folks should go to start with Windows issues.
9 years ago
Eric Haszlakiewicz
ea1499a372
Issue #263 : add const so the prototype for json_object_object_add_ex() matches the definition.
9 years ago
Randy Armstrong
c5b5a984cd
Add Cmakefile
9 years ago
Eric Haszlakiewicz
0fcf1d1ae7
Fix memory leak and inconsistent output (due to varying fd numbers) in test_util_file.
9 years ago
Eric Haszlakiewicz
5fccfed4f4
Issue #260 : add a check to prevent trivial loops in the object tree, even though it is up to the callers to avoid doing so in more complex cases.
9 years ago
Eric Haszlakiewicz
c4d060bf80
json_object_object_add_ex() should have shared code with json_object_object_add(), and been changed to return int at the same time the latter was. Do that now.
Also correct a couple of calls to _to_json_string to check the return value.
9 years ago
Eric Haszlakiewicz
e40505e489
Merge branch 'RyDroid-tests'
9 years ago
Eric Haszlakiewicz
61cd433131
Merge branch 'tests' of https://github.com/RyDroid/json-c into RyDroid-tests
Conflicts:
tests/test_util_file.c
9 years ago
Eric Haszlakiewicz
e076ae756d
Merge pull request #251 from RyDroid/editorconfig
Adding a file for EditorConfig
9 years ago
Nicola Spanti (RyDroid)
8215c0ac0e
Very minor changes to some tests
9 years ago
Nicola Spanti (RyDroid)
b222d4386e
Adding a file for EditorConfig
9 years ago
Eric Haszlakiewicz
4d62de3898
Revert bogus change to json_object_get() made in f40b08d8
that caused it to always return NULL. (Issue #259 )
Also undo NULL check in json_tokener_set_flags(): it's not at all valid toi
try to set flags on a NULL pointer, and doing so should not be silently
ignored.
9 years ago
Eric Haszlakiewicz
0ad87649d4
Merge pull request #255 from RyDroid/minor-c2
Minor changes in C source code
9 years ago
Eric Haszlakiewicz
9f9a9ac426
Merge pull request #252 from RyDroid/minor-no-c
Very minor changes not related to C source code
9 years ago
Eric Haszlakiewicz
71d0615e98
Merge branch 'jobol-issue-165'
9 years ago
Eric Haszlakiewicz
f3db59d990
Merge branch 'issue-165' of https://github.com/jobol/json-c into jobol-issue-165
Conflicts:
tests/test_util_file.c
9 years ago
Eric Haszlakiewicz
bc3e691a1e
Merge pull request #253 from RyDroid/cppcheck-travis
Adding a test with cppcheck for Travis CI
9 years ago
Eric Haszlakiewicz
51b011ce24
Merge pull request #249 from RyDroid/readme
Improving README
9 years ago
Eric Haszlakiewicz
d758f4a8a7
Add a brief style guide. Address Issue #257 .
9 years ago
Eric Haszlakiewicz
33ae9f5d44
Merge pull request #250 from RyDroid/gitignore
Improving .gitignore
9 years ago
Nicola Spanti (RyDroid)
ab1d761865
Improving .gitignore
9 years ago