mirror/json-c
1
0
Fork 0
mirror of https://github.com/json-c/json-c.git synced 2026-03-20 21:49:07 +08:00
Code Issues Packages Projects Releases Wiki Activity
98 Commits 14 Branches 11 Tags
ca519fb81735bf8eb7a6cf4ddb77f036efcaac61
Commit Graph

98 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Keith Derrick
ca519fb817 Added explanatory notes to documentation. 2012-04-05 19:54:12 -07:00
Eric Haszlakiewicz
0d79b53456 Fix some bugs with how buffer sizes were being calcuated in printbuf_memset and an off-by-one error in printbuf_memappend. 2012-04-03 14:54:25 -05:00
Eric Haszlakiewicz
61a154e58b Remove the "#undef PRINTBUF_DEBUG" from printbuf.h so it can be more easily turned on in the Makefile. 2012-04-03 14:48:15 -05:00
Eric Haszlakiewicz
2d48543f2e Add a printbuf_memset() function to provide an effecient way to set and append things like whitespace indentation. 2012-04-02 15:39:55 -05:00
Eric Haszlakiewicz
781798ccdf Direct people to send bug reports to the json-c google group. 2012-03-31 23:17:31 -05:00
Eric Haszlakiewicz
fbd207bd6b Remove a few more things in the distclean target to get rid of *all* generated files. 2012-03-31 23:17:00 -05:00
Eric Haszlakiewicz
d809fa60c5 Fix a bug in json_tokener_parse_ex when re-using the same tokener to parse multiple objects. Now, json_tokener_reset() does not need to be called after a valid object is parsed. 2012-03-31 22:53:43 -05:00
Eric Haszlakiewicz
c5c623a546 Split the json_tokener_parse tests off from test1 into their own test and add several more cases to check various incremental parsing situations. 2012-03-31 22:51:39 -05:00
Eric Haszlakiewicz
1489b081a7 For the prototype for json_tokener_error_desc(). 2012-03-31 22:49:58 -05:00
Eric Haszlakiewicz
6ff0817bac Mention json_type_to_name() in the docs for json_object_get_type(). 2012-03-31 22:47:47 -05:00
Eric Haszlakiewicz
64c0ca3690 Define a LH_LOAD_FACTOR constant and note the range that it can be set to. 
Change the resize check from "count > size" to "count >= size" to avoid a
potential infinite loop with high load factors and a full hash table.
 2012-03-31 17:33:58 -05:00
Eric Haszlakiewicz
aef439a175 Adjust json_object_is_type and json_object_get_type so they return json_type_null for NULL objects. 2012-03-31 13:47:28 -05:00
Eric Haszlakiewicz
7e57d63aeb Merge pull request #16 from kdopen/master 
Renaming the boolean type to json_bool in json_object.h
 2012-03-31 11:12:20 -07:00
Eric Haszlakiewicz
d3c37b82a6 Ignore several more files, include .o's, .lo's, etc... 2012-03-31 12:55:52 -05:00
Eric Haszlakiewicz
3620cba6d0 Perform better error checking in json_tokener_parse_verbose and rewrite json_tokener_parse to use that instead of json_tokener_parse_ex. 
Fix a typo in the string represenations of the json_tokener_error_depth error (s/to deep/too deep/)
 2012-03-31 12:52:59 -05:00
Keith Derrick
37e7467476 Rename boolean type to json_bool 
In building large systems, there are often clashes over the
preferred base type to use for bool/boolean. At least one
experience has been with a 3rd party proprietary library which
can not be changed. In that case, boolean was a synonym for
unsigned char and used widely in packed structures.
 2012-03-26 14:29:31 -07:00
Eric Haszlakiewicz
2f9091f559 Add json_tokener_get_error() and json_tokener_error_desc() to better encapsulate the process of retrieving errors while parsing. 
Add documentation for the json_tokener_parse_ex() function.
 2012-02-22 08:24:40 -06:00
Eric Haszlakiewicz
b21b137805 Include json_inttypes.h in json_object.h since we use types like int32_t in the API and some systems need that header to compile. 
As part of this create a public json_config.h with a custom define to
decide whether to include inttypes.h to avoid conflicting with other
projects config.h header.
 2012-02-15 20:47:11 -06:00
Eric Haszlakiewicz
15db9372f3 Merge branch 'master' of https://github.com/json-c/json-c 2012-02-15 19:38:07 -06:00
Eric Haszlakiewicz
44f0f62252 Issue#10: add some const qualifiers so test1 compiles again. 2012-02-15 19:37:04 -06:00
Eric Haszlakiewicz
0bc84fcaaf Merge pull request #12 from jameinel/win32-project 
Some updates to make the code compatible with VC 9 (2008)
 2012-02-15 17:11:47 -08:00
John Arbash Meinel
6a231e4b41 Some updates to make the code compatible with VC 9 (2008) 
VC 9 doesn't support late variable declarations, and doesn't have inttypes
so we need some direct definitions of a couple of more types.
 2012-02-01 09:27:49 +01:00
Eric Haszlakiewicz
faa535386a Merge pull request #11 from deweerdt/master 
json_tokener_parse(): avoid possible NULL deref
 2012-01-29 15:49:48 -08:00
Frederik Deweerdt
db050901fa json_tokener_parse(): avoid possible NULL deref 2012-01-18 17:01:19 -08:00
Eric Haszlakiewicz
393085a4ba Merge pull request #7 from federicoculloca/master 
Added capitals to characters to json_hex_chars
 2011-12-09 14:42:41 -08:00
Eric Haszlakiewicz
fc3d2114a6 Merge pull request #8 from mstorsjo/mingw 
Add -no-undefined to the libtool flags
 2011-12-09 14:41:40 -08:00
Martin Storsjo
a577ba376f Add -no-undefined to the libtool flags 
This allows building DLLs for windows - libtool doesn't even
try to do that unless this flag is specified.
 2011-11-25 23:43:25 +02:00
Federico Culloca
7ec34c9b39 Added capitalized charaters to json_hex_chars 2011-10-30 12:13:15 +01:00
Eric Haszlakiewicz
fbae8ad0ad Merge pull request #4 from deweerdt/master 
Add new json_object_array_sort function
 2011-10-12 17:42:36 -07:00
Frederik Deweerdt
c43871c866 Add new json_object_array_sort function 
- uses libc's qsort to sort the arraylist
 - add test in test1.c
 2011-10-07 21:07:18 +02:00
Eric Haszlakiewicz
a8ffbe97b0 Add an initial (incomplete) release checklist. 2011-06-14 10:01:27 -05:00
Eric Haszlakiewicz
06e52abedb Add Jehiah and myself to the list of authors. 2011-06-14 09:56:00 -05:00
Michael Clark
e6c76dab66 Update README files with pointers to new github repo and googlegroups mailing list 2011-06-14 10:04:24 +08:00
Jehiah Czebotar
276123efe0 handle NULL passed to json_objct_object_get 
Patch via Nikola Pajkovsky


git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@75 327403b1-1117-474d-bef2-5cb71233fd97
 2011-05-26 01:34:52 +00:00
Jehiah Czebotar
43d2f417c7 move definition of json_object_iter to public header to enable external use of json_object_object_foreachC 
Patch from Rick Moran <https://github.com/DrHayt>


git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@74 327403b1-1117-474d-bef2-5cb71233fd97
 2011-05-25 04:49:20 +00:00
Eric Haszlakiewicz
1910225b7c Set the svn:executable property so running the test_null test works properly. 
git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@73 327403b1-1117-474d-bef2-5cb71233fd97
 2011-05-03 21:28:11 +00:00
Eric Haszlakiewicz
a37ddcff2d Note the json-c home page in the README file. 
git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@72 327403b1-1117-474d-bef2-5cb71233fd97
 2011-05-03 21:19:55 +00:00
Eric Haszlakiewicz
20707f4e14 Note a few recent changes in the ChangeLog. 
git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@71 327403b1-1117-474d-bef2-5cb71233fd97
 2011-05-03 21:17:50 +00:00
Eric Haszlakiewicz
7a593a0fa7 Bump up the libtool library version to "1:0:1" (aka libjson.0.1.0) since the API has been extended, but is still backwards compatible.. 
git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@70 327403b1-1117-474d-bef2-5cb71233fd97
 2011-05-03 21:12:17 +00:00
Eric Haszlakiewicz
0354e19c31 Bump the version to 0.10, since that's what we were at. 
git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@69 327403b1-1117-474d-bef2-5cb71233fd97
 2011-05-03 21:09:30 +00:00
Eric Haszlakiewicz
41e67d0f6f Add a test_cast test case. This checks that the casting that is implied when calling the various json_object_get_FOO() functions on a differently typed object works correctly. 
git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@68 327403b1-1117-474d-bef2-5cb71233fd97
 2011-05-03 20:42:25 +00:00
Eric Haszlakiewicz
886c4fbebf Add a json_type_to_name() function which returns a string that describes the type. Useful for logging. 
git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@67 327403b1-1117-474d-bef2-5cb71233fd97
 2011-05-03 20:40:49 +00:00
Eric Haszlakiewicz
e2e16011f0 Fix a bug in json_object_get_int() where calling it on a string type object would always return 0, instead of the actual numerical value of the string. 
git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@66 327403b1-1117-474d-bef2-5cb71233fd97
 2011-05-03 20:39:07 +00:00
Eric Haszlakiewicz
d1342d6f2d Add a dummy "NEWS" file to automake doesn't complain. 
git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@65 327403b1-1117-474d-bef2-5cb71233fd97
 2011-05-03 19:24:07 +00:00
Jehiah Czebotar
c096f5a7d7 readme updates 
git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@64 327403b1-1117-474d-bef2-5cb71233fd97
 2011-01-14 18:02:00 +00:00
Jehiah Czebotar
ac601b5b5f update json_object_new_string_len, json_escape_str (internal). Writer handles \x00 correctly 
Added parse_null test. This does not change anything with how the parser handles \u0000 or null characters

This commit is addapted from one by Adomas Paltanavičius <adomas@leanholding.com>



git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@63 327403b1-1117-474d-bef2-5cb71233fd97
 2011-01-14 17:23:06 +00:00
Jehiah Czebotar
a503ee8217 add json_tokener_parse_verbose, and return NULL on parser errors 
git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@62 327403b1-1117-474d-bef2-5cb71233fd97
 2010-12-08 03:52:07 +00:00
Jehiah Czebotar
5644272f03 set svn:ignore and .gitignore to skip intermediate build files 
git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@61 327403b1-1117-474d-bef2-5cb71233fd97
 2010-12-07 23:22:33 +00:00
ehaszla
252669cee6 Simplify things by storing integer values only as int64_t's internally, and 
omit the range check during parsing since we already have the checks when
 accessing the value. There is no longer a json_type_int64, only json_type_int.
Fix some problems with parsing 0 and -0 values, and add a couple of tests.
Fix some minor compile issues on HPUX environments.


git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@60 327403b1-1117-474d-bef2-5cb71233fd97
 2010-12-07 18:15:35 +00:00
Michael Clark
f1ae67dbf0 * Fix file descriptor leak if memory allocation fails in json_util 
Zachary Blair, zack_blair at hotmail dot com



git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@59 327403b1-1117-474d-bef2-5cb71233fd97
 2010-10-13 14:10:51 +00:00