]>
granicus.if.org Git - json-c/log
Eric Haszlakiewicz [Sun, 29 Jul 2012 17:13:54 +0000 (12:13 -0500)]
Initialize errno before calling sscanf in json_parse_int64() so parsing valid numbers after parsing an out of range number works.
Eric Haszlakiewicz [Sun, 29 Jul 2012 16:46:22 +0000 (09:46 -0700)]
Merge pull request #37 from cgwalters/master
autogen.sh: Add /bin/sh interpreter, honor NOCONFIGURE=1 …
Eric Haszlakiewicz [Wed, 25 Jul 2012 04:27:41 +0000 (23:27 -0500)]
Rewrite json_object_object_add to replace just the value if the key already exists so keys remain valid.
This is particularly useful when replacing values in a loop, since it allows
the key used by json_object_object_foreach to continue to be used.
Colin Walters [Wed, 11 Jul 2012 19:33:49 +0000 (15:33 -0400)]
autogen.sh: Add /bin/sh interpreter, honor NOCONFIGURE=1
First, we should be able to execute as "./autogen.sh". Second,
add support for NOCONFIGURE=1. For more information,
see http://people.gnome.org/~walters/docs/build-api.txt
Eric Haszlakiewicz [Mon, 9 Jul 2012 02:01:19 +0000 (19:01 -0700)]
Merge pull request #26 from ford-prefect/master
Android build system
Eric Haszlakiewicz [Mon, 9 Jul 2012 01:38:53 +0000 (20:38 -0500)]
Add json_object_iterator.h to installed headers.
Eric Haszlakiewicz [Mon, 9 Jul 2012 01:33:25 +0000 (20:33 -0500)]
Fix git commands for tagging a release.
Eric Haszlakiewicz [Mon, 9 Jul 2012 01:32:12 +0000 (20:32 -0500)]
Remove unnecessary comment from json_util.c
Eric Haszlakiewicz [Mon, 9 Jul 2012 01:27:02 +0000 (18:27 -0700)]
Merge pull request #33 from mloskot/master
Added a bunch of missing HAVE_* defines
Mateusz Loskot [Tue, 19 Jun 2012 19:15:44 +0000 (20:15 +0100)]
Added a bunch of missing HAVE_* defines tested with ./configure script to fix compilation on Linux with GCC 4.7.1. The issue likely caused by my previous commits related to Visual C++ port of the code.
Eric Haszlakiewicz [Thu, 31 May 2012 05:04:05 +0000 (22:04 -0700)]
Merge pull request #27 from OBI-1/master
array_list_expand_internal needs length, not index.
Eric Haszlakiewicz [Thu, 31 May 2012 04:57:28 +0000 (21:57 -0700)]
Merge pull request #29 from mloskot/msvc-port
Add missing casts from void* and replace #if HAVE_X with #ifdef HAVE_X
Eric Haszlakiewicz [Thu, 31 May 2012 04:03:34 +0000 (23:03 -0500)]
Use "nodoc", not "doc", for the name of the tarball w/o docs.
Mateusz Loskot [Tue, 22 May 2012 22:51:44 +0000 (23:51 +0100)]
Missing explicit casts from void* to specific pointers required. Added #define strcasecmp for Visual C++.
Mateusz Loskot [Mon, 21 May 2012 22:22:36 +0000 (23:22 +0100)]
Replaced #if HAVE_X with #ifdef HAVE_X as the former test is troublemaker with #define HAVE_X where #define HAVE_X 1|0 is meant.
OBI-1 [Wed, 9 May 2012 10:52:17 +0000 (13:52 +0300)]
array_list_expand_internal needs length, not index.
(The current implementation will fail when adding index 65.)
Eric Haszlakiewicz [Sun, 29 Apr 2012 17:54:14 +0000 (12:54 -0500)]
Update the ChangeLog with the rest of the changes that will be included in the 0.10 release.
Eric Haszlakiewicz [Sun, 29 Apr 2012 17:54:04 +0000 (12:54 -0500)]
Fill in the missing pieces of the release checklist.
Eric Haszlakiewicz [Sun, 29 Apr 2012 16:04:33 +0000 (11:04 -0500)]
Change the format used for sprintbuf (but not scanf) to use %f instead of %lf because the "l" is unnecessary and some compilers behave differently with it present (e.g. MinGW).
Thanks for Mateusz Loskot for the fix.
Eric Haszlakiewicz [Sat, 28 Apr 2012 19:17:09 +0000 (14:17 -0500)]
Ignore the new test1Formatted and test2Formatted executables.
Eric Haszlakiewicz [Sat, 28 Apr 2012 19:14:26 +0000 (14:14 -0500)]
Extend test1 and test2 to run using json_object_to_json_string_ext() based on an additional command line parameter.
Extend the run_output_test() function so we actually can pass command line
parameters and so we can support different output files for the same test
executable.
Also provide some hints about what to do if a test fails (i.e. set VERBOSE=1).
Eric Haszlakiewicz [Sat, 28 Apr 2012 18:26:09 +0000 (13:26 -0500)]
Add a json_object_to_json_string_ext() function to allow the formatting of output to be selected.
There are now three options: JSON_C_TO_STRING_SPACED, JSON_C_TO_STRING_PLAIN and JSON_C_TO_STRING_PRETTY.
This also add a json_object_to_file_ext() that takes the same flags.
Existing output of json_object_to_json_string() is unchanged, and uses JSON_C_TO_STRING_SPACED.
Thanks fo Grant Edwards for the initial patches.
Arun Raghavan [Fri, 20 Jan 2012 07:30:45 +0000 (13:00 +0530)]
Add an Android-friendly build system
This dependson the Androgenizer project, which helps keep autofoo-based build
systems in sync with the Android build.
Arun Raghavan [Fri, 20 Jan 2012 07:29:59 +0000 (12:59 +0530)]
Run configure in the autogen.sh script
This is convention in most open source projects.
Arun Raghavan [Fri, 20 Jan 2012 07:29:30 +0000 (12:59 +0530)]
Add a pkgconfig file for uninstalled builds
This allows systems certain types of build setups to work. Specifically, this
will help when building on Android and using json-c as a dependency for another
package.
Eric Haszlakiewicz [Wed, 25 Apr 2012 03:17:13 +0000 (22:17 -0500)]
Fixed parsing numbers in E notation. `
Eric Haszlakiewicz [Wed, 25 Apr 2012 02:54:07 +0000 (21:54 -0500)]
Since we already use a local json_bool type, replace any stdbool.h usage with
that, since not all environments actually have a stdbool.h to use.
Eric Haszlakiewicz [Tue, 24 Apr 2012 18:43:29 +0000 (11:43 -0700)]
Merge pull request #25 from kdopen/doc_cleanup
Clean up documentation and correct sample code
Keith Derrick [Mon, 23 Apr 2012 22:34:44 +0000 (15:34 -0700)]
Clean up documentation and correct sample code
Eric Haszlakiewicz [Mon, 23 Apr 2012 18:30:37 +0000 (11:30 -0700)]
Merge pull request #23 from mloskot/mloskot-msvc-fixes
Fix missing inttypes.h definitions for Visual Studio 2010 and earliers. ...
Mateusz Loskot [Mon, 23 Apr 2012 12:11:11 +0000 (13:11 +0100)]
Fix missing inttypes.h definitions for Visual Studio 2010 and earliers. Related to issue #22.
Eric Haszlakiewicz [Mon, 23 Apr 2012 04:40:07 +0000 (21:40 -0700)]
Merge pull request #21 from kdopen/add_iterator
Add new iterator implementation and some NULL-pointer safety
Eric Haszlakiewicz [Sun, 22 Apr 2012 19:26:06 +0000 (14:26 -0500)]
Merge branch 'master' of https://github.com/json-c/json-c
Eric Haszlakiewicz [Sun, 22 Apr 2012 19:25:08 +0000 (14:25 -0500)]
Actually save the expected output for the test_printbuf test so it passes.
Eric Haszlakiewicz [Sun, 22 Apr 2012 19:21:27 +0000 (14:21 -0500)]
Update the list of files to ignore.
Eric Haszlakiewicz [Sun, 22 Apr 2012 19:13:01 +0000 (14:13 -0500)]
Add a test for the printbuf functions.
Eric Haszlakiewicz [Sun, 22 Apr 2012 15:48:30 +0000 (10:48 -0500)]
Use a different variable when referring to the json.la file, since the original lib_LTLIBRARIES means something special to automake.
Eric Haszlakiewicz [Sun, 22 Apr 2012 15:33:41 +0000 (10:33 -0500)]
Move the rest of the tests into the tests subdirectory.
Eric Haszlakiewicz [Sun, 22 Apr 2012 15:27:50 +0000 (10:27 -0500)]
Create a tests subdirectory and move one of the test to there.
Eric Haszlakiewicz [Fri, 20 Apr 2012 04:03:22 +0000 (21:03 -0700)]
Merge pull request #20 from kdopen/master
Additional explanatory comments
Keith Derrick [Thu, 12 Apr 2012 16:54:21 +0000 (09:54 -0700)]
Add alternative iterator implementation
Keith Derrick [Thu, 12 Apr 2012 18:44:13 +0000 (11:44 -0700)]
Add NULL-safe get object method
New json_object_object_get_ex() method protects itself against null pointers
and invalid objects being passed in.
Keith Derrick [Thu, 12 Apr 2012 18:43:34 +0000 (11:43 -0700)]
Add NULL-safe lookup function
New lh_table_lookup_ex() method protects itself against null pointers
and invalid objects being passed in.
Keith Derrick [Thu, 12 Apr 2012 18:40:44 +0000 (11:40 -0700)]
Add JASSERT macro to guarantee aborts
Keith Derrick [Fri, 6 Apr 2012 02:33:09 +0000 (19:33 -0700)]
Added explanatory notes to documentation.
Eric Haszlakiewicz [Tue, 3 Apr 2012 19:54:25 +0000 (14:54 -0500)]
Fix some bugs with how buffer sizes were being calcuated in printbuf_memset and an off-by-one error in printbuf_memappend.
Eric Haszlakiewicz [Tue, 3 Apr 2012 19:48:15 +0000 (14:48 -0500)]
Remove the "#undef PRINTBUF_DEBUG" from printbuf.h so it can be more easily turned on in the Makefile.
Eric Haszlakiewicz [Mon, 2 Apr 2012 20:39:55 +0000 (15:39 -0500)]
Add a printbuf_memset() function to provide an effecient way to set and append things like whitespace indentation.
Eric Haszlakiewicz [Sun, 1 Apr 2012 04:17:31 +0000 (23:17 -0500)]
Direct people to send bug reports to the json-c google group.
Eric Haszlakiewicz [Sun, 1 Apr 2012 04:17:00 +0000 (23:17 -0500)]
Remove a few more things in the distclean target to get rid of *all* generated files.
Eric Haszlakiewicz [Sun, 1 Apr 2012 03:53:43 +0000 (22:53 -0500)]
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.
Eric Haszlakiewicz [Sun, 1 Apr 2012 03:51:39 +0000 (22:51 -0500)]
Split the json_tokener_parse tests off from test1 into their own test and add several more cases to check various incremental parsing situations.
Eric Haszlakiewicz [Sun, 1 Apr 2012 03:49:58 +0000 (22:49 -0500)]
For the prototype for json_tokener_error_desc().
Eric Haszlakiewicz [Sun, 1 Apr 2012 03:47:47 +0000 (22:47 -0500)]
Mention json_type_to_name() in the docs for json_object_get_type().
Eric Haszlakiewicz [Sat, 31 Mar 2012 22:33:58 +0000 (17:33 -0500)]
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.
Eric Haszlakiewicz [Sat, 31 Mar 2012 18:47:28 +0000 (13:47 -0500)]
Adjust json_object_is_type and json_object_get_type so they return json_type_null for NULL objects.
Eric Haszlakiewicz [Sat, 31 Mar 2012 18:12:20 +0000 (11:12 -0700)]
Merge pull request #16 from kdopen/master
Renaming the boolean type to json_bool in json_object.h
Eric Haszlakiewicz [Sat, 31 Mar 2012 17:55:52 +0000 (12:55 -0500)]
Ignore several more files, include .o's, .lo's, etc...
Eric Haszlakiewicz [Sat, 31 Mar 2012 17:52:59 +0000 (12:52 -0500)]
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/)
Keith Derrick [Mon, 26 Mar 2012 21:29:31 +0000 (14:29 -0700)]
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.
Eric Haszlakiewicz [Wed, 22 Feb 2012 14:24:40 +0000 (08:24 -0600)]
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.
Eric Haszlakiewicz [Thu, 16 Feb 2012 02:44:54 +0000 (20:44 -0600)]
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.
Eric Haszlakiewicz [Thu, 16 Feb 2012 01:38:07 +0000 (19:38 -0600)]
Merge branch 'master' of https://github.com/json-c/json-c
Eric Haszlakiewicz [Thu, 16 Feb 2012 01:37:04 +0000 (19:37 -0600)]
Issue#10: add some const qualifiers so test1 compiles again.
Eric Haszlakiewicz [Thu, 16 Feb 2012 01:11:47 +0000 (17:11 -0800)]
Merge pull request #12 from jameinel/win32-project
Some updates to make the code compatible with VC 9 (2008)
John Arbash Meinel [Wed, 1 Feb 2012 08:27:49 +0000 (09:27 +0100)]
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.
Eric Haszlakiewicz [Sun, 29 Jan 2012 23:49:48 +0000 (15:49 -0800)]
Merge pull request #11 from deweerdt/master
json_tokener_parse(): avoid possible NULL deref
Frederik Deweerdt [Thu, 19 Jan 2012 01:01:19 +0000 (17:01 -0800)]
json_tokener_parse(): avoid possible NULL deref
Eric Haszlakiewicz [Fri, 9 Dec 2011 22:42:41 +0000 (14:42 -0800)]
Merge pull request #7 from federicoculloca/master
Added capitals to characters to json_hex_chars
Eric Haszlakiewicz [Fri, 9 Dec 2011 22:41:40 +0000 (14:41 -0800)]
Merge pull request #8 from mstorsjo/mingw
Add -no-undefined to the libtool flags
Martin Storsjo [Fri, 25 Nov 2011 21:43:25 +0000 (23:43 +0200)]
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.
Federico Culloca [Sun, 30 Oct 2011 11:13:15 +0000 (12:13 +0100)]
Added capitalized charaters to json_hex_chars
Eric Haszlakiewicz [Thu, 13 Oct 2011 00:42:36 +0000 (17:42 -0700)]
Merge pull request #4 from deweerdt/master
Add new json_object_array_sort function
Frederik Deweerdt [Fri, 7 Oct 2011 19:07:18 +0000 (21:07 +0200)]
Add new json_object_array_sort function
- uses libc's qsort to sort the arraylist
- add test in test1.c
Eric Haszlakiewicz [Tue, 14 Jun 2011 15:01:27 +0000 (10:01 -0500)]
Add an initial (incomplete) release checklist.
Eric Haszlakiewicz [Tue, 14 Jun 2011 14:56:00 +0000 (09:56 -0500)]
Add Jehiah and myself to the list of authors.
Michael Clark [Tue, 14 Jun 2011 02:04:24 +0000 (10:04 +0800)]
Update README files with pointers to new github repo and googlegroups mailing list
Jehiah Czebotar [Thu, 26 May 2011 01:34:52 +0000 (01:34 +0000)]
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
Jehiah Czebotar [Wed, 25 May 2011 04:49:20 +0000 (04:49 +0000)]
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
Eric Haszlakiewicz [Tue, 3 May 2011 21:28:11 +0000 (21:28 +0000)]
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
Eric Haszlakiewicz [Tue, 3 May 2011 21:19:55 +0000 (21:19 +0000)]
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
Eric Haszlakiewicz [Tue, 3 May 2011 21:17:50 +0000 (21:17 +0000)]
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
Eric Haszlakiewicz [Tue, 3 May 2011 21:12:17 +0000 (21:12 +0000)]
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
Eric Haszlakiewicz [Tue, 3 May 2011 21:09:30 +0000 (21:09 +0000)]
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
Eric Haszlakiewicz [Tue, 3 May 2011 20:42:25 +0000 (20:42 +0000)]
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
Eric Haszlakiewicz [Tue, 3 May 2011 20:40:49 +0000 (20:40 +0000)]
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
Eric Haszlakiewicz [Tue, 3 May 2011 20:39:07 +0000 (20:39 +0000)]
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
Eric Haszlakiewicz [Tue, 3 May 2011 19:24:07 +0000 (19:24 +0000)]
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
Jehiah Czebotar [Fri, 14 Jan 2011 18:02:00 +0000 (18:02 +0000)]
readme updates
git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@64
327403b1 -1117-474d-bef2-
5cb71233fd97
Jehiah Czebotar [Fri, 14 Jan 2011 17:23:06 +0000 (17:23 +0000)]
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
Jehiah Czebotar [Wed, 8 Dec 2010 03:52:07 +0000 (03:52 +0000)]
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
Jehiah Czebotar [Tue, 7 Dec 2010 23:22:33 +0000 (23:22 +0000)]
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
ehaszla [Tue, 7 Dec 2010 18:15:35 +0000 (18:15 +0000)]
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
Michael Clark [Wed, 13 Oct 2010 14:10:51 +0000 (14:10 +0000)]
* 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
Michael Clark [Wed, 13 Oct 2010 14:09:41 +0000 (14:09 +0000)]
* 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
Michael Clark [Thu, 7 Oct 2010 01:05:14 +0000 (01:05 +0000)]
Update executable properties
git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@57
327403b1 -1117-474d-bef2-
5cb71233fd97
Michael Clark [Wed, 6 Oct 2010 16:39:20 +0000 (16:39 +0000)]
* 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
Michael Clark [Thu, 27 Aug 2009 06:40:59 +0000 (06:40 +0000)]
* 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
Michael Clark [Thu, 27 Aug 2009 06:40:00 +0000 (06:40 +0000)]
* 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
Brent Miller [Thu, 20 Aug 2009 06:50:22 +0000 (06:50 +0000)]
* Add handling of surrogate pairs
git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@53
327403b1 -1117-474d-bef2-
5cb71233fd97