Alexander Klauer
2be921d883
Fixed json_object_object_add().
* Return value of json_object_object_add() changed from void to int.
Return value now indicates success or failure.
* Check whether allocations are successful.
* Do not exit program from within the library.
12 years ago
Eric Haszlakiewicz
85da28c534
Merge pull request #58 from Abioy/master
escape '\f' in json_escape_str
12 years ago
Abioy
7eaa849e9a
escape '\f' in json_escape_str
'\f' is a llegal char and should be escape in printbuf
12 years ago
Eric Haszlakiewicz
fcc768e667
Bump the version up to 0.10.99 to make it clear that the master branch is beyond anything on the 0.10 branch.
12 years ago
Eric Haszlakiewicz
2943691181
Merge branch 'master' of https://github.com/json-c/json-c
12 years ago
Eric Haszlakiewicz
1461b49385
Add a json_c_version.h header (included from json.h), and several macros and functions for retrieving the json-c version at compile-time and run-time.
12 years ago
Eric Haszlakiewicz
56166e2dff
Merge pull request #51 from remicollet/issue-dyndepth
Make maximum recursion depth a runtime option
12 years ago
Eric Haszlakiewicz
d7de3aa24b
Update the release checklist to include the INSTALL file, and adjust the git command to add the doc directory.
12 years ago
Eric Haszlakiewicz
2e9fef38c2
Revert the test_null test back to emitted to stdout, and update the expected output to match.
12 years ago
Eric Haszlakiewicz
86aedc2d2a
Merge pull request #56 from TheCount/develop
Some houskeeping
12 years ago
Alexander Klauer
18abf6e509
More warnings, fewer errors, C99
12 years ago
Alexander Klauer
024d86c07f
Prepend DESTDIR to paths for staged installs
12 years ago
Alexander Klauer
57f36ed32a
Write additional test info to stderr instead of stdout so as not to mar the expected output
12 years ago
Alexander Klauer
827a4a97b9
Fixed memory leak in testReplaceExisting
12 years ago
Alexander Klauer
beb12d49e1
Make macro json_object_object_foreach multiple-use safe
12 years ago
Alexander Klauer
20ef1bd980
Remove and ignore autogenerated installation instructions
12 years ago
Alexander Klauer
8f58f09c69
Ignore editor swap files
12 years ago
Alexander Klauer
54d551c810
Ignore doc dir for now
12 years ago
Alexander Klauer
b1d61d10e1
Library is now called libjson-c
12 years ago
Alexander Klauer
a3a0f5b28d
Need to explicitly remove include/json-c directory
12 years ago
Alexander Klauer
b670f6f992
-d test is useless as symlinks are dereferenced
12 years ago
Alexander Klauer
e176965c1c
Ignore valgrind output files
12 years ago
Eric Haszlakiewicz
4e4af93d66
Fix issue #53 - ensure explicit length string are still NUL terminated, and fix json_tokener_parse() to work properly with embedded unicode \u0000 values in strings.
Adjust test_null to check for this case.
See also http://bugs.debian.org/687269
12 years ago
Eric Haszlakiewicz
7a4506d6df
Remove configure as part of maintainer-clean instead of distclean. Addresses issue #48 .
12 years ago
Eric Haszlakiewicz
7653d4952a
Add PACKAGE_URL to config.h.in
12 years ago
Eric Haszlakiewicz
aec876357c
Add a missing json_object_get() so we don't try to use a freed object in test1.
13 years ago
Eric Haszlakiewicz
447b88a115
Fix a memory leak in the test_printbuf test.
13 years ago
Eric Haszlakiewicz
23461c75dd
Include json_object_iterator.c in the list of sources.
13 years ago
Remi Collet
197cb1d1c1
Make maximum recursion depth a runtime option
13 years ago
Eric Haszlakiewicz
f6b27cbb6c
Make it safe to delete keys while iterating with the json_object_object_foreach macro.
13 years ago
Eric Haszlakiewicz
5abc0ea444
Reformat the json_object_object_foreach macro so it is readable, and document what is allowed to be done with the object while iterating.
13 years ago
Eric Haszlakiewicz
e36e562872
Reformat json_object_object_get() and json_object_object_get_ex().
13 years ago
Eric Haszlakiewicz
5450bed051
Fix json_object_object_get() so it returns NULL if the incoming json_object is NULL.
13 years ago
Eric Haszlakiewicz
5f4739e2eb
Change json_object_put to return 1 if the object passed was actually freed. (or 0 if only the reference count was decremented)
13 years ago
Eric Haszlakiewicz
c3d1d597ab
Fix a memory leak in test1 with respect to how json_object_object_del was used.
13 years ago
Eric Haszlakiewicz
c3068bfd09
Reformat the test sources. No functional change.
13 years ago
Eric Haszlakiewicz
d1f237e28a
Fix the home page in the README, and add a list of prerequisites.
13 years ago
Eric Haszlakiewicz
059e8f4d1d
Merge pull request #44 from lastquestion/fix_gnu_macosx
Add an autoconf test to test whether the .section .gnu<warning>
13 years ago
Lin Xu
e7e0600405
Add an autoconf test to test whether the .section .gnu<warning>
works with the linker on the system, and define _warn_references
to nothing if not.
13 years ago
Eric Haszlakiewicz
4b1a0668a8
Update the set_serializer test to match the actual output.
13 years ago
Eric Haszlakiewicz
38f421a2e7
Add a json_set_serializer() function to allow the string output of a json_object to be customized.
13 years ago
Eric Haszlakiewicz
f74e8f8f9b
Add my copyright.
13 years ago
Eric Haszlakiewicz
d305cae12c
Ignore the tests/testReplaceExisting binary.
13 years ago
Eric Haszlakiewicz
8ce53f9d1e
Note the rename in the ChangeLog, and update the instructions in the README file.
13 years ago
Eric Haszlakiewicz
2f2180b70d
Take a guess as to the rename changes changes needed to the Android part of the build.
I think this should work, but I can't test it.
13 years ago
Eric Haszlakiewicz
1f9d199522
Re-add the "json" pkg-config file as a compatibility shim.
Also rename the json-c-uninstalled.pc file.
13 years ago
Eric Haszlakiewicz
9f16e25a3e
Bump the version of the new library since programs will need to be re-linked to use it.
13 years ago
Eric Haszlakiewicz
943b7a4de7
Add a compatibility symlink json->json-c in the include directory.
13 years ago
Eric Haszlakiewicz
075b783631
Add a --disable-oldname-compat option to configure to turn off the creation of the libjson.so library, and only include libjson-c.so
13 years ago
Eric Haszlakiewicz
c7a21203de
Ignore a couple more generated files.
13 years ago