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
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
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
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
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
Eric Haszlakiewicz