LineageOS/android_external_json-c
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
282 Commits 2 Branches 0 Tags
1d6f9140ba9f9200f23b5b91dafafd749d61241c
Commit Graph

282 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michael Clark
bd0a567673 * 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@58 327403b1-1117-474d-bef2-5cb71233fd97
 2010-10-13 14:09:41 +00:00
Michael Clark
d34701ed38 Update executable properties 
git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@57 327403b1-1117-474d-bef2-5cb71233fd97
 2010-10-07 01:05:14 +00:00
Michael Clark
c4dceae1c5 * Add int64 support. Two new functions json_object_net_int64 and 
json_object_get_int64. Binary compatibility preserved.
    Eric Haszlakiewicz, EHASZLA at transunion com
    Rui Miguel Silva Seabra, rms at 1407 dot org



git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@56 327403b1-1117-474d-bef2-5cb71233fd97
 2010-10-06 16:39:20 +00:00
Michael Clark
88ded9ceb8 * Make json_object_from_file take const char *filename 
Spotted by Vikram Raj V, vsagar at attinteractive dot com


git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@55 327403b1-1117-474d-bef2-5cb71233fd97
 2009-08-27 06:40:59 +00:00
Michael Clark
f5dd43a9d1 * Fix subtle bug in linkhash where lookup could hang after all slots 
were filled then successively freed.
    Spotted by Jean-Marc Naud, j dash m at newtraxtech dot com


git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@54 327403b1-1117-474d-bef2-5cb71233fd97
 2009-08-27 06:40:00 +00:00
Brent Miller
126ad95fc4 * Add handling of surrogate pairs 
git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@53 327403b1-1117-474d-bef2-5cb71233fd97
 2009-08-20 06:50:22 +00:00
Brent Miller
f8663fc16f * Correct comment describing printbuf_memappend in printbuf.h 
git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@52 327403b1-1117-474d-bef2-5cb71233fd97
 2009-08-20 06:41:32 +00:00
Michael Clark
51658855fb Add json-c.vcproj to EXTRA_DIST 
git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@51 327403b1-1117-474d-bef2-5cb71233fd97
 2009-08-19 08:31:29 +00:00
Michael Clark
50626cd81f Add mailing lists to README.html 
git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@50 327403b1-1117-474d-bef2-5cb71233fd97
 2009-08-19 08:18:25 +00:00
Michael Clark
09abeffda3 Add note about autoconf README changes to ChangeLog 
git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@49 327403b1-1117-474d-bef2-5cb71233fd97
 2009-08-19 07:23:23 +00:00
Christopher Watford
db92cc02b9 Add README.html, README-WIN32.html and config.h.win32 to EXTRA_DIST in Makefile.am 
git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@47 327403b1-1117-474d-bef2-5cb71233fd97
 2009-07-31 02:59:02 +00:00
Christopher Watford
1363df08d2 Update version to 0.9 
git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@46 327403b1-1117-474d-bef2-5cb71233fd97
 2009-07-31 02:50:48 +00:00
Christopher Watford
b22565d1fd Update changelog 
git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@45 327403b1-1117-474d-bef2-5cb71233fd97
 2009-07-31 02:12:46 +00:00
Michael Clark
c80ba8dd42 typo fix 
git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@44 327403b1-1117-474d-bef2-5cb71233fd97
 2009-07-25 00:21:18 +00:00
Michael Clark
7fb9b03ffd * Rename min and max so we can never clash with C or C++ std library 
Ian Atha, thatha at yahoo-inc dot com



git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@43 327403b1-1117-474d-bef2-5cb71233fd97
 2009-07-25 00:13:44 +00:00
Christopher Watford
b1a22ac85f Add const qualifier to the json_tokener_parse functions 
Eric Haszlakiewicz, EHASZLA at transunion dot com



git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@42 327403b1-1117-474d-bef2-5cb71233fd97
 2009-07-08 04:02:05 +00:00