mirror/json-c
1
0
Fork 0
mirror of https://github.com/json-c/json-c.git synced 2026-03-22 06:29:06 +08:00
Code Issues Packages Projects Releases Wiki Activity
215 Commits 14 Branches 11 Tags
2be921d88376e78f84d79aafa6db2714da804e59
Commit Graph

215 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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.
 2013-01-08 14:24:21 +01:00
Eric Haszlakiewicz
85da28c534 Merge pull request #58 from Abioy/master 
escape '\f' in json_escape_str
 2013-01-02 10:08:44 -08:00
Abioy
7eaa849e9a escape '\f' in json_escape_str 
'\f' is a llegal char and should be escape in printbuf
 2012-12-24 22:22:05 +08:00
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. 2012-12-23 11:09:20 -06:00
Eric Haszlakiewicz
2943691181 Merge branch 'master' of https://github.com/json-c/json-c 2012-12-23 10:59:52 -06:00
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. 2012-12-23 10:57:44 -06:00
Eric Haszlakiewicz
56166e2dff Merge pull request #51 from remicollet/issue-dyndepth 
Make maximum recursion depth a runtime option
 2012-12-23 08:39:46 -08:00
Eric Haszlakiewicz
d7de3aa24b Update the release checklist to include the INSTALL file, and adjust the git command to add the doc directory. 2012-12-23 10:27:14 -06:00
Eric Haszlakiewicz
2e9fef38c2 Revert the test_null test back to emitted to stdout, and update the expected output to match. 2012-12-23 10:25:03 -06:00
Eric Haszlakiewicz
86aedc2d2a Merge pull request #56 from TheCount/develop 
Some houskeeping
 2012-12-23 08:23:13 -08:00
Alexander Klauer
18abf6e509 More warnings, fewer errors, C99 2012-12-19 13:55:02 +01:00
Alexander Klauer
024d86c07f Prepend DESTDIR to paths for staged installs 2012-12-19 13:16:38 +01:00
Alexander Klauer
57f36ed32a Write additional test info to stderr instead of stdout so as not to mar the expected output 2012-12-19 10:52:50 +01:00
Alexander Klauer
827a4a97b9 Fixed memory leak in testReplaceExisting 2012-12-19 10:46:35 +01:00
Alexander Klauer
beb12d49e1 Make macro json_object_object_foreach multiple-use safe 2012-12-19 10:31:39 +01:00
Alexander Klauer
20ef1bd980 Remove and ignore autogenerated installation instructions 2012-12-19 09:40:10 +01:00
Alexander Klauer
8f58f09c69 Ignore editor swap files 2012-12-19 09:38:45 +01:00
Alexander Klauer
54d551c810 Ignore doc dir for now 2012-12-18 18:53:04 +01:00
Alexander Klauer
b1d61d10e1 Library is now called libjson-c 2012-12-18 18:46:24 +01:00
Alexander Klauer
a3a0f5b28d Need to explicitly remove include/json-c directory 2012-12-18 18:45:39 +01:00
Alexander Klauer
b670f6f992 -d test is useless as symlinks are dereferenced 2012-12-18 18:44:52 +01:00
Alexander Klauer
e176965c1c Ignore valgrind output files 2012-12-18 18:27:39 +01:00
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
 2012-12-09 16:32:11 -06:00
Eric Haszlakiewicz
7a4506d6df Remove configure as part of maintainer-clean instead of distclean. Addresses issue #48. 2012-12-09 15:46:35 -06:00
Eric Haszlakiewicz
7653d4952a Add PACKAGE_URL to config.h.in 2012-12-09 15:46:23 -06:00
Eric Haszlakiewicz
aec876357c Add a missing json_object_get() so we don't try to use a freed object in test1. 2012-11-29 15:06:17 -05:00
Eric Haszlakiewicz
447b88a115 Fix a memory leak in the test_printbuf test. 2012-11-29 13:29:55 -06:00
Eric Haszlakiewicz
23461c75dd Include json_object_iterator.c in the list of sources. 2012-11-29 13:23:06 -06:00
Remi Collet
197cb1d1c1 Make maximum recursion depth a runtime option 2012-11-27 09:01:45 +01:00
Eric Haszlakiewicz
f6b27cbb6c Make it safe to delete keys while iterating with the json_object_object_foreach macro. 2012-10-20 20:26:37 -05:00
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. 2012-10-20 20:10:15 -05:00
Eric Haszlakiewicz
e36e562872 Reformat json_object_object_get() and json_object_object_get_ex(). 2012-10-18 17:16:36 -05:00
Eric Haszlakiewicz
5450bed051 Fix json_object_object_get() so it returns NULL if the incoming json_object is NULL. 2012-10-18 17:14:41 -05:00
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) 2012-10-18 17:10:09 -05:00
Eric Haszlakiewicz
c3d1d597ab Fix a memory leak in test1 with respect to how json_object_object_del was used. 2012-09-16 20:49:22 -05:00
Eric Haszlakiewicz
c3068bfd09 Reformat the test sources. No functional change. 2012-09-16 20:43:29 -05:00
Eric Haszlakiewicz
d1f237e28a Fix the home page in the README, and add a list of prerequisites. 2012-09-10 17:32:14 -05:00
Eric Haszlakiewicz
059e8f4d1d Merge pull request #44 from lastquestion/fix_gnu_macosx 
Add an autoconf test to test whether the .section .gnu<warning>
 2012-09-09 19:24:47 -07:00
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.
 2012-09-09 17:36:30 -07:00
Eric Haszlakiewicz
4b1a0668a8 Update the set_serializer test to match the actual output. 2012-09-09 13:53:12 -05:00
Eric Haszlakiewicz
38f421a2e7 Add a json_set_serializer() function to allow the string output of a json_object to be customized. 2012-09-02 15:21:56 -05:00
Eric Haszlakiewicz
f74e8f8f9b Add my copyright. 2012-07-29 20:02:00 -05:00
Eric Haszlakiewicz
d305cae12c Ignore the tests/testReplaceExisting binary. 2012-07-29 20:00:28 -05:00
Eric Haszlakiewicz
8ce53f9d1e Note the rename in the ChangeLog, and update the instructions in the README file. 2012-07-29 18:43:55 -05:00
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.
 2012-07-29 18:29:38 -05:00
Eric Haszlakiewicz
1f9d199522 Re-add the "json" pkg-config file as a compatibility shim. 
Also rename the json-c-uninstalled.pc file.
 2012-07-29 18:25:09 -05:00
Eric Haszlakiewicz
9f16e25a3e Bump the version of the new library since programs will need to be re-linked to use it. 2012-07-29 18:05:34 -05:00
Eric Haszlakiewicz
943b7a4de7 Add a compatibility symlink json->json-c in the include directory. 2012-07-29 18:05:08 -05:00
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 2012-07-29 17:48:22 -05:00
Eric Haszlakiewicz
c7a21203de Ignore a couple more generated files. 2012-07-29 15:10:30 -05:00