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

55 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Christopher Watford
543bb1431f Erik Hovland (3): 
Fix any noticeable spelling or grammar errors.
      Make sure every va_start has a va_end.
      Check all pointers for validity.



git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@41 327403b1-1117-474d-bef2-5cb71233fd97
 2009-07-08 03:46:10 +00:00
Christopher Watford
c5cbf8214a Disable REFCOUNT_DEBUG by default in json_object.c 
git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@40 327403b1-1117-474d-bef2-5cb71233fd97
 2009-06-30 03:40:53 +00:00
Christopher Watford
ffa742a552 Ooops. remove literal ^M (copy and paste problem) 
git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@39 327403b1-1117-474d-bef2-5cb71233fd97
 2009-05-12 02:40:24 +00:00
Christopher Watford
9bc863ed3f Change note about CVS repository to point to subversion repos 
git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@38 327403b1-1117-474d-bef2-5cb71233fd97
 2009-05-12 02:36:04 +00:00
Michael Clark
24ea8c0414 update changelog for json_object_get_boolean fix 
git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@36 327403b1-1117-474d-bef2-5cb71233fd97
 2009-04-27 08:22:22 +00:00
Michael Clark
6f70e44b7d Fix json_object_get_boolean to return false for empty string 
Spotted by Vitaly Kruglikov, Vitaly dot Kruglikov at palm dot com


git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@35 327403b1-1117-474d-bef2-5cb71233fd97
 2009-04-27 08:19:27 +00:00
Michael Clark
95f55a761c optimizations to json_tokener_parse_ex(), printbuf_memappend() 
-- Brent Miller, bdmiller at yahoo dash inc dot com


git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@34 327403b1-1117-474d-bef2-5cb71233fd97
 2009-04-27 08:16:58 +00:00
Michael Clark
aaec1ef3c5 * Don't use this as a variable, so we can compile with a C++ compiler 
* Add casts from void* to type of assignment when using malloc 
  * Add #ifdef __cplusplus guards to all of the headers
  * Add typedefs for json_object, json_tokener, array_list, printbuf, lh_table
    Michael Clark, <michael@metaparadigm.com>


git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@33 327403b1-1117-474d-bef2-5cb71233fd97
 2009-02-25 02:31:32 +00:00
Michael Clark
266a3fd301 * Don't use this as a variable, so we can compile with a C++ compiler 
Michael Clark, <michael@metaparadigm.com>


git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@32 327403b1-1117-474d-bef2-5cb71233fd97
 2009-02-25 01:55:31 +00:00
Michael Clark
22dee7cb59 * Null pointer dereference fix. Fix json_object_get_boolean strlen test 
to not return TRUE for zero length string. Remove redundant includes.
    Erik Hovland, erik at hovland dot org


git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@31 327403b1-1117-474d-bef2-5cb71233fd97
 2009-02-25 01:51:40 +00:00
Michael Clark
e8de078806 * Fixed warning reported by adding -Wstrict-prototypes 
-Wold-style-definition to the compilatin flags.
    Dotan Barak, dotanba at gmail dot com


git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@30 327403b1-1117-474d-bef2-5cb71233fd97
 2009-02-25 01:45:00 +00:00
Michael Clark
75d0f12135 fix typo 
git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@29 327403b1-1117-474d-bef2-5cb71233fd97
 2009-01-10 14:14:12 +00:00
Michael Clark
e6548a3dc2 fix typo in json_object.h 
git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@28 327403b1-1117-474d-bef2-5cb71233fd97
 2009-01-10 13:58:06 +00:00
Michael Clark
68cafad078 Add const correctness to public interfaces 
Gerard Krol, g dot c dot krol at student dot tudelft dot nl

Update version number to 0.9



git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@27 327403b1-1117-474d-bef2-5cb71233fd97
 2009-01-06 22:56:57 +00:00
Michael Clark
436aa98d67 update auto generated files 
git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@26 327403b1-1117-474d-bef2-5cb71233fd97
 2009-01-06 22:53:25 +00:00
Michael Clark
4b831c3b2f Update version to 0.8 
git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@25 327403b1-1117-474d-bef2-5cb71233fd97
 2009-01-05 07:01:14 +00:00
Michael Clark
80a6007009 changes to make 'make dist' work properly 
git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@24 327403b1-1117-474d-bef2-5cb71233fd97
 2009-01-05 06:55:02 +00:00
Michael Clark
8cdac64ccd Add va_end for every va_start. 
Dotan Barak, dotanba at gmail dot com



git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@23 327403b1-1117-474d-bef2-5cb71233fd97
 2009-01-05 03:57:59 +00:00
Michael Clark
a0d35c7ebf change version to 0.8 
git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@22 327403b1-1117-474d-bef2-5cb71233fd97
 2008-08-08 06:54:28 +00:00
Michael Clark
a3272546b1 fix to allow compile with -Werror 
-- Geoffrey Young, geoff at modperlcookbook dot org



git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@21 327403b1-1117-474d-bef2-5cb71233fd97
 2008-01-26 01:10:47 +00:00
Michael Clark
14862b1ef3 Patch allows for json-c compile with -Werror and not fail due to 
-Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations
Geoffrey Young, geoff at modperlcookbook dot org



git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@20 327403b1-1117-474d-bef2-5cb71233fd97
 2007-12-07 02:50:42 +00:00
Michael Clark
c8f4a6e7de * Fix bug with use of capital E in numbers with exponents 
Mateusz Loskot, mateusz at loskot dot net
  * Add stddef.h include



git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@19 327403b1-1117-474d-bef2-5cb71233fd97
 2007-12-07 02:44:24 +00:00
Michael Clark
dfaf670436 * Add macros to enable compiling out debug code 
Geoffrey Young, geoff at modperlcookbook dot org


git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@18 327403b1-1117-474d-bef2-5cb71233fd97
 2007-10-25 02:26:00 +00:00
Michael Clark
ecf2c9b74b Update version number to 0.7 
git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@17 327403b1-1117-474d-bef2-5cb71233fd97
 2007-05-17 13:30:29 +00:00
Michael Clark
a850f8e29e * Add escaping of backslash to json output 
* Add escaping of foward slash on tokenizing and output
  * Changes to internal tokenizer from using recursion to
    using a depth state structure to allow incremental parsing


git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@14 327403b1-1117-474d-bef2-5cb71233fd97
 2007-03-13 08:26:26 +00:00
Michael Clark
837240f75f * Fix bug in escaping of control characters 
Johan Bj�rklund, johbjo09 at kth dot se
  * Remove include "config.h" from headers (should only
    be included from .c files)
    Michael Clark <michael@metaparadigm.com>


git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@12 327403b1-1117-474d-bef2-5cb71233fd97
 2007-03-13 08:26:25 +00:00
Michael Clark
f6a6e486ff * Make headers C++ compatible by change *this to *obj 
* Add ifdef C++ extern "C" to headers
  * Use simpler definition of min and max in bits.h
    Larry Lansing, llansing at fuzzynerd dot com

  * Remove automake 1.6 requirement
  * Move autogen commands into autogen.sh. Update README
  * Remove error pointer special case for Windows
  * Change license from LGPL to MIT
    Michael Clark <michael@metaparadigm.com>


git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@10 327403b1-1117-474d-bef2-5cb71233fd97
 2007-03-13 08:26:23 +00:00