]> granicus.if.org Git - json-c/log
json-c
12 years agoTake a guess as to the rename changes changes needed to the Android part of the build.
Eric Haszlakiewicz [Sun, 29 Jul 2012 23:29:38 +0000 (18:29 -0500)]
Take a guess as to the rename changes changes needed to the Android part of the build.
I think this should work, but I can't test it.

12 years agoRe-add the "json" pkg-config file as a compatibility shim.
Eric Haszlakiewicz [Sun, 29 Jul 2012 23:25:09 +0000 (18:25 -0500)]
Re-add the "json" pkg-config file as a compatibility shim.
Also rename the json-c-uninstalled.pc file.

12 years agoBump the version of the new library since programs will need to be re-linked to use it.
Eric Haszlakiewicz [Sun, 29 Jul 2012 23:05:34 +0000 (18:05 -0500)]
Bump the version of the new library since programs will need to be re-linked to use it.

12 years agoAdd a compatibility symlink json->json-c in the include directory.
Eric Haszlakiewicz [Sun, 29 Jul 2012 23:05:08 +0000 (18:05 -0500)]
Add a compatibility symlink json->json-c in the include directory.

12 years agoAdd a --disable-oldname-compat option to configure to turn off the creation of the...
Eric Haszlakiewicz [Sun, 29 Jul 2012 22:48:22 +0000 (17:48 -0500)]
Add a --disable-oldname-compat option to configure to turn off the creation of the libjson.so library, and only include libjson-c.so

12 years agoIgnore a couple more generated files.
Eric Haszlakiewicz [Sun, 29 Jul 2012 20:10:30 +0000 (15:10 -0500)]
Ignore a couple more generated files.

12 years agoFix the Libs line in json-uninstalled.pc to use -ljson-c
Eric Haszlakiewicz [Sun, 29 Jul 2012 20:09:59 +0000 (15:09 -0500)]
Fix the Libs line in json-uninstalled.pc to use -ljson-c

12 years agoCreate an additional libjson.so library that simply links against libjson-c, but...
Eric Haszlakiewicz [Sun, 29 Jul 2012 19:59:01 +0000 (14:59 -0500)]
Create an additional libjson.so library that simply links against libjson-c, but emits a warning encouraging the use of the new library.

12 years agoCheck for the sys/cdefs.h header which on some systems defines the __warn_references...
Eric Haszlakiewicz [Sun, 29 Jul 2012 19:57:59 +0000 (14:57 -0500)]
Check for the sys/cdefs.h header which on some systems defines the __warn_references macro.

12 years agoRemove test_parse from the top level directory. (accidentally re-introduced with...
Eric Haszlakiewicz [Sun, 29 Jul 2012 19:08:26 +0000 (14:08 -0500)]
Remove test_parse from the top level directory.  (accidentally re-introduced with the last merge)

12 years agoMerge branch 'rename_library' of https://github.com/kdopen/json-c into kdopen-rename_...
Eric Haszlakiewicz [Sun, 29 Jul 2012 19:06:52 +0000 (14:06 -0500)]
Merge branch 'rename_library' of https://github.com/kdopen/json-c into kdopen-rename_library

Conflicts:
.gitignore
Makefile.am
configure.in
printbuf.c
test1.c
test1.expected

12 years agoHandle the \f escape sequence (the two characters: backslash followed by an f, not...
Eric Haszlakiewicz [Sun, 29 Jul 2012 17:31:07 +0000 (12:31 -0500)]
Handle the \f escape sequence (the two characters: backslash followed by an f, not a literal formfeed) and extend the test_parse test to check all valid escape sequences.

12 years agoDefault autogen.sh to not running configure, unless some command line options are...
Eric Haszlakiewicz [Sun, 29 Jul 2012 17:18:37 +0000 (12:18 -0500)]
Default autogen.sh to not running configure, unless some command line options are specified.

12 years agoInitialize errno before calling sscanf in json_parse_int64() so parsing valid numbers...
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.

12 years agoMerge pull request #37 from cgwalters/master
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 …

12 years agoRewrite json_object_object_add to replace just the value if the key already exists...
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.

12 years agoautogen.sh: Add /bin/sh interpreter, honor NOCONFIGURE=1
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

12 years agoMerge pull request #26 from ford-prefect/master
Eric Haszlakiewicz [Mon, 9 Jul 2012 02:01:19 +0000 (19:01 -0700)]
Merge pull request #26 from ford-prefect/master

Android build system

12 years agoAdd json_object_iterator.h to installed headers.
Eric Haszlakiewicz [Mon, 9 Jul 2012 01:38:53 +0000 (20:38 -0500)]
Add json_object_iterator.h to installed headers.

12 years agoFix git commands for tagging a release.
Eric Haszlakiewicz [Mon, 9 Jul 2012 01:33:25 +0000 (20:33 -0500)]
Fix git commands for tagging a release.

12 years agoRemove unnecessary comment from json_util.c
Eric Haszlakiewicz [Mon, 9 Jul 2012 01:32:12 +0000 (20:32 -0500)]
Remove unnecessary comment from json_util.c

12 years agoMerge pull request #33 from mloskot/master
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

12 years agoAdded a bunch of missing HAVE_* defines tested with ./configure script to fix compila...
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.

12 years agoMerge pull request #27 from OBI-1/master
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.

12 years agoMerge pull request #29 from mloskot/msvc-port
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

12 years agoUse "nodoc", not "doc", for the name of the tarball w/o docs.
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.

12 years agoMissing explicit casts from void* to specific pointers required. Added #define strcas...
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++.

12 years agoReplaced #if HAVE_X with #ifdef HAVE_X as the former test is troublemaker with #defin...
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.

12 years agoarray_list_expand_internal needs length, not index.
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.)

12 years agoUpdate the ChangeLog with the rest of the changes that will be included in the 0...
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.

12 years agoFill in the missing pieces of the release checklist.
Eric Haszlakiewicz [Sun, 29 Apr 2012 17:54:04 +0000 (12:54 -0500)]
Fill in the missing pieces of the release checklist.

12 years agoChange the format used for sprintbuf (but not scanf) to use %f instead of %lf because...
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.

12 years agoIgnore the new test1Formatted and test2Formatted executables.
Eric Haszlakiewicz [Sat, 28 Apr 2012 19:17:09 +0000 (14:17 -0500)]
Ignore the new test1Formatted and test2Formatted executables.

12 years agoExtend test1 and test2 to run using json_object_to_json_string_ext() based on an...
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).

12 years agoAdd a json_object_to_json_string_ext() function to allow the formatting of output...
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.

12 years agoAdd an Android-friendly build system
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.

12 years agoRun configure in the autogen.sh script
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.

12 years agoAdd a pkgconfig file for uninstalled builds
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.

12 years agoFixed parsing numbers in E notation. `
Eric Haszlakiewicz [Wed, 25 Apr 2012 03:17:13 +0000 (22:17 -0500)]
Fixed parsing numbers in E notation. `

12 years agoSince we already use a local json_bool type, replace any stdbool.h usage with
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.

12 years agoMerge pull request #25 from kdopen/doc_cleanup
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

12 years agoClean 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

12 years agoMerge pull request #23 from mloskot/mloskot-msvc-fixes
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. ...

12 years agoFix missing inttypes.h definitions for Visual Studio 2010 and earliers. Related to...
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.

12 years agoMerge pull request #21 from kdopen/add_iterator
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

12 years agoMerge branch 'master' of https://github.com/json-c/json-c
Eric Haszlakiewicz [Sun, 22 Apr 2012 19:26:06 +0000 (14:26 -0500)]
Merge branch 'master' of https://github.com/json-c/json-c

12 years agoActually save the expected output for the test_printbuf test so it passes.
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.

12 years agoUpdate the list of files to ignore.
Eric Haszlakiewicz [Sun, 22 Apr 2012 19:21:27 +0000 (14:21 -0500)]
Update the list of files to ignore.

12 years agoAdd a test for the printbuf functions.
Eric Haszlakiewicz [Sun, 22 Apr 2012 19:13:01 +0000 (14:13 -0500)]
Add a test for the printbuf functions.

12 years agoUse a different variable when referring to the json.la file, since the original lib_L...
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.

12 years agoMove the rest of the tests into the tests subdirectory.
Eric Haszlakiewicz [Sun, 22 Apr 2012 15:33:41 +0000 (10:33 -0500)]
Move the rest of the tests into the tests subdirectory.

12 years agoCreate a tests subdirectory and move one of the test to there.
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.

12 years agoMerge pull request #20 from kdopen/master
Eric Haszlakiewicz [Fri, 20 Apr 2012 04:03:22 +0000 (21:03 -0700)]
Merge pull request #20 from kdopen/master

Additional explanatory comments

12 years agoAdd alternative iterator implementation
Keith Derrick [Thu, 12 Apr 2012 16:54:21 +0000 (09:54 -0700)]
Add alternative iterator implementation

12 years agoAdd NULL-safe get object method
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.

12 years agoAdd NULL-safe lookup function
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.

12 years agoAdd JASSERT macro to guarantee aborts
Keith Derrick [Thu, 12 Apr 2012 18:40:44 +0000 (11:40 -0700)]
Add JASSERT macro to guarantee aborts

12 years agoAdded explanatory notes to documentation.
Keith Derrick [Fri, 6 Apr 2012 02:33:09 +0000 (19:33 -0700)]
Added explanatory notes to documentation.

12 years agoIgnoring additional build products
Keith Derrick [Fri, 30 Mar 2012 19:34:01 +0000 (12:34 -0700)]
Ignoring additional build products

12 years agoModify install names for library and include files
Keith Derrick [Fri, 30 Mar 2012 19:28:32 +0000 (12:28 -0700)]
Modify install names for library and include files

Changing root name of library to json-c, and also the
directory where header files are installed to .../jsdon-c/*.

This avoids clashes with other implementations of JSON libraries.

12 years agoAdded explanatory notes to documentation.
Keith Derrick [Fri, 6 Apr 2012 02:33:09 +0000 (19:33 -0700)]
Added explanatory notes to documentation.

12 years agoFix some bugs with how buffer sizes were being calcuated in printbuf_memset and an...
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.

12 years agoRemove the "#undef PRINTBUF_DEBUG" from printbuf.h so it can be more easily turned...
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.

12 years agoAdd a printbuf_memset() function to provide an effecient way to set and append things...
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.

12 years agoFix some bugs with how buffer sizes were being calcuated in printbuf_memset and an...
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.

12 years agoRemove the "#undef PRINTBUF_DEBUG" from printbuf.h so it can be more easily turned...
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.

12 years agoAdd a printbuf_memset() function to provide an effecient way to set and append things...
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.

12 years agoDirect people to send bug reports to the json-c google group.
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.

12 years agoRemove a few more things in the distclean target to get rid of *all* generated files.
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.

12 years agoFix a bug in json_tokener_parse_ex when re-using the same tokener to parse multiple...
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.

12 years agoSplit the json_tokener_parse tests off from test1 into their own test and add several...
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.

12 years agoFor the prototype for json_tokener_error_desc().
Eric Haszlakiewicz [Sun, 1 Apr 2012 03:49:58 +0000 (22:49 -0500)]
For the prototype for json_tokener_error_desc().

12 years agoMention json_type_to_name() in the docs for json_object_get_type().
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().

12 years agoDefine a LH_LOAD_FACTOR constant and note the range that it can be set to.
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.

12 years agoAdjust json_object_is_type and json_object_get_type so they return json_type_null...
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.

12 years agoIgnore several more files, include .o's, .lo's, etc...
Eric Haszlakiewicz [Sat, 31 Mar 2012 17:55:52 +0000 (12:55 -0500)]
Ignore several more files, include .o's, .lo's, etc...

12 years agoPerform better error checking in json_tokener_parse_verbose and rewrite json_tokener_...
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/)

12 years agoDirect people to send bug reports to the json-c google group.
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.

12 years agoRemove a few more things in the distclean target to get rid of *all* generated files.
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.

12 years agoFix a bug in json_tokener_parse_ex when re-using the same tokener to parse multiple...
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.

12 years agoSplit the json_tokener_parse tests off from test1 into their own test and add several...
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.

12 years agoFor the prototype for json_tokener_error_desc().
Eric Haszlakiewicz [Sun, 1 Apr 2012 03:49:58 +0000 (22:49 -0500)]
For the prototype for json_tokener_error_desc().

12 years agoMention json_type_to_name() in the docs for json_object_get_type().
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().

12 years agoDefine a LH_LOAD_FACTOR constant and note the range that it can be set to.
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.

12 years agoAdjust json_object_is_type and json_object_get_type so they return json_type_null...
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.

12 years agoMerge pull request #16 from kdopen/master
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

12 years agoIgnore several more files, include .o's, .lo's, etc...
Eric Haszlakiewicz [Sat, 31 Mar 2012 17:55:52 +0000 (12:55 -0500)]
Ignore several more files, include .o's, .lo's, etc...

12 years agoPerform better error checking in json_tokener_parse_verbose and rewrite json_tokener_...
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/)

12 years agoRename boolean type to json_bool
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.

12 years agoAdd json_tokener_get_error() and json_tokener_error_desc() to better encapsulate...
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.

12 years agoInclude json_inttypes.h in json_object.h since we use types like int32_t in the API...
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.

12 years agoMerge branch 'master' of https://github.com/json-c/json-c
Eric Haszlakiewicz [Thu, 16 Feb 2012 01:38:07 +0000 (19:38 -0600)]
Merge branch 'master' of https://github.com/json-c/json-c

12 years agoIssue#10: add some const qualifiers so test1 compiles again.
Eric Haszlakiewicz [Thu, 16 Feb 2012 01:37:04 +0000 (19:37 -0600)]
Issue#10: add some const qualifiers so test1 compiles again.

12 years agoMerge pull request #12 from jameinel/win32-project
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)

12 years agoSome 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.

12 years agoMerge pull request #11 from deweerdt/master
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

12 years ago 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

13 years agoMerge pull request #7 from federicoculloca/master
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

13 years agoMerge pull request #8 from mstorsjo/mingw
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

13 years agoAdd -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.