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
Stoian Ivanov
05f025c075
some basic set
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
Nicola Spanti (RyDroid)
f2e7dda910
Improving README
9 years ago
Nicola Spanti (RyDroid)
36b4003118
Adding a test with cppcheck for Travis CI
9 years ago
Nicola Spanti (RyDroid)
f40b08d8f0
Minor changes in C source code
9 years ago
Nicola Spanti (RyDroid)
250a3987cf
Very minor changes not related to C source code
9 years ago
Eric Haszlakiewicz
9688f343a5
Issue #246 : Include xlocale.h too, to get locale_t defined, since not all OSes include that in locale.h
9 years ago
José Bollo
1fceb2207a
test: add test of 'json_object_to_json_string_length'
The test is implied in test1.
The idea is to check that the returned lengths and strings
are identical to what is expected to return the already
tested function 'json_object_to_json_string_ext'.
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
9 years ago
Eric Haszlakiewicz
fa76e4a8c9
Issue #195 : Actually call uselocale() in the new locale handling code in json_tokener.
Also, be sure the right locale_t is freed if we fail on the second uselocale.
Finally, fix test_locale so it *doesn't* use json_object_to_json_string as
that will simple re-emit the original parsed string values.
9 years ago
Eric Haszlakiewicz
4091b9c87e
Issue #195 : use uselocale() instead of setlocale() in json_tokener to behave better in threaded environments.
9 years ago
Eric Haszlakiewicz
7d637362b7
Linux's %p format doesn't return "0x0" for NULL pointers, so switch to using %lx for consistency.
9 years ago
Eric Haszlakiewicz
deb9fa482d
Issue #240 : add arbitrary use of val's in foreach loops to squash warnings about unused variables.
9 years ago
jobol
344009bf26
Add method 'json_object_to_json_string_length'
This new method allows to also
get the length of the generated string.
Fix #165
Change-Id: Iea91404027f143ca3d29a4c58d7c07ae53556110
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
9 years ago
José Bollo
54ae254537
Fix a compiling error
The function fstat isn't declared without this include
on debian strect/sid and Fedora-23
Change-Id: I660a32ff173dcba04674aed51ed855b4fa55ac67
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
9 years ago
Eric Haszlakiewicz
b366750e11
Merge pull request #239 from ploxiln/printbuf_empty
initialize null terminator of new printbuf
9 years ago
Pierce Lopez
868b20ce4e
initialize null terminator of new printbuf
It's possible (e.g. by using json_object_from_file() on an empty file)
to get json-c to try to use a printbuf that has never had anything
written to it. Before this change, it could access a string that
should be length zero, but was never initialized, and could
theoretically have an unexpected string.
9 years ago
Eric Haszlakiewicz
2b255d0ebf
Fix absolute paths in test_util_file that vary depending on where it is run.
9 years ago
Eric Haszlakiewicz
b1d65b62db
Issue #113 : Add more files to EXTRA_DIST and a dist-hook to get distcheck to at least not fail.
9 years ago
Eric Haszlakiewicz
1071385896
Issue #113 : add "new" files to appropriate variables in Makefile, and note the need to run "make distcheck" as part of the release process.
Fix issues with the test script so it works under distcheck too.
9 years ago
Eric Haszlakiewicz
29005ef7b1
Merge pull request #238 from nagamalli9999/master
linkhash.c: optimised the table_free path
9 years ago
Eric Haszlakiewicz
29ef73f21d
Issue #189 : Eliminate use of MC_ERROR from json_util.c, and add a json_util_get_last_err() function to retrieve the error for those callers that care about it.
Add tests and descriptions for the functions in json_util.c
9 years ago
Eswar Yaganti
78cf6e63ff
linkhash.h: removed redundant params from comments
9 years ago
Eswar Yaganti
5fb63a09f9
linkhash.c: optimised the table_free path
9 years ago