Eric Haszlakiewicz [Mon, 4 Mar 2013 04:34:34 +0000 (20:34 -0800)]
Merge pull request #70 from tg--/master
rename AM_CONFIG_HEADER to AC_CONFIG_HEADER
Eric Haszlakiewicz [Mon, 4 Mar 2013 04:26:28 +0000 (22:26 -0600)]
Issue #68: use -std=gnu99 because some versions of gcc seem to think that -std=c99 also implies -ansi, which causes warnings and build breakage.
Thomas Gstädtner [Sat, 2 Mar 2013 23:17:25 +0000 (00:17 +0100)]
configure.in: mv AM_CONFIG_HEADER to AC_CONFIG_HEADER
the former has been deprecated and does not work on newer autoconf
versions.
Eric Haszlakiewicz [Wed, 27 Feb 2013 03:14:07 +0000 (21:14 -0600)]
Include the test_locale test in the tests that run.
Eric Haszlakiewicz [Wed, 27 Feb 2013 03:09:10 +0000 (21:09 -0600)]
Merge branch 'remicollet-issue-float'
Conflicts:
json_util.c
Eric Haszlakiewicz [Thu, 21 Feb 2013 18:32:29 +0000 (12:32 -0600)]
Mark the "val" variable in json_object_object_foreach as unused so the compiler doesn't complain. Fix warnings in the testReplaceExisting test.
Eric Haszlakiewicz [Sat, 9 Feb 2013 23:35:33 +0000 (17:35 -0600)]
Add a runtime check to see if parse_int64 needs to workaround sscanf bugs. If that workaround is not needed parsing is nearly twice as fast.
Eric Haszlakiewicz [Sat, 9 Feb 2013 22:35:24 +0000 (16:35 -0600)]
Enable -Werror and fix a number of minor warnings that existed.
Eric Haszlakiewicz [Sat, 9 Feb 2013 22:18:05 +0000 (16:18 -0600)]
Add a comment briefly describing json_object_object_length()
Eric Haszlakiewicz [Sat, 9 Feb 2013 22:14:33 +0000 (14:14 -0800)]
Merge pull request #62 from ghazel/master
json_object_object_length
Eric Haszlakiewicz [Sat, 9 Feb 2013 21:59:51 +0000 (13:59 -0800)]
Merge pull request #66 from ichernev/fix-test-parse
Fixed test_parse for \f
Iskren Chernev [Tue, 29 Jan 2013 03:06:49 +0000 (19:06 -0800)]
Fixed test_parse for \f
Greg Hazel [Fri, 11 Jan 2013 09:36:55 +0000 (01:36 -0800)]
add json_object_object_length
Eric Haszlakiewicz [Wed, 9 Jan 2013 23:26:42 +0000 (15:26 -0800)]
Merge pull request #60 from ghazel/master
rename _errno
Greg Hazel [Fri, 4 Jan 2013 00:54:04 +0000 (16:54 -0800)]
rename _errno
Eric Haszlakiewicz [Wed, 2 Jan 2013 18:08:44 +0000 (10:08 -0800)]
Merge pull request #58 from Abioy/master
escape '\f' in json_escape_str
Abioy [Mon, 24 Dec 2012 14:22:05 +0000 (22:22 +0800)]
escape '\f' in json_escape_str
'\f' is a llegal char and should be escape in printbuf
Eric Haszlakiewicz [Sun, 23 Dec 2012 17:09:20 +0000 (11:09 -0600)]
Bump the version up to 0.10.99 to make it clear that the master branch is beyond anything on the 0.10 branch.
Eric Haszlakiewicz [Sun, 23 Dec 2012 16:59:52 +0000 (10:59 -0600)]
Merge branch 'master' of https://github.com/json-c/json-c
Eric Haszlakiewicz [Sun, 23 Dec 2012 16:57:44 +0000 (10:57 -0600)]
Add a json_c_version.h header (included from json.h), and several macros and functions for retrieving the json-c version at compile-time and run-time.
Eric Haszlakiewicz [Sun, 23 Dec 2012 16:39:46 +0000 (08:39 -0800)]
Merge pull request #51 from remicollet/issue-dyndepth
Make maximum recursion depth a runtime option
Eric Haszlakiewicz [Sun, 23 Dec 2012 16:27:14 +0000 (10:27 -0600)]
Update the release checklist to include the INSTALL file, and adjust the git command to add the doc directory.
Eric Haszlakiewicz [Sun, 23 Dec 2012 16:25:03 +0000 (10:25 -0600)]
Revert the test_null test back to emitted to stdout, and update the expected output to match.
Eric Haszlakiewicz [Sun, 23 Dec 2012 16:23:13 +0000 (08:23 -0800)]
Merge pull request #56 from TheCount/develop
Some houskeeping
Alexander Klauer [Wed, 19 Dec 2012 12:55:02 +0000 (13:55 +0100)]
More warnings, fewer errors, C99
Alexander Klauer [Wed, 19 Dec 2012 12:16:38 +0000 (13:16 +0100)]
Prepend DESTDIR to paths for staged installs
Alexander Klauer [Wed, 19 Dec 2012 09:52:50 +0000 (10:52 +0100)]
Write additional test info to stderr instead of stdout so as not to mar the expected output
Alexander Klauer [Wed, 19 Dec 2012 09:46:35 +0000 (10:46 +0100)]
Fixed memory leak in testReplaceExisting
Alexander Klauer [Wed, 19 Dec 2012 09:31:39 +0000 (10:31 +0100)]
Make macro json_object_object_foreach multiple-use safe
Alexander Klauer [Wed, 19 Dec 2012 08:40:10 +0000 (09:40 +0100)]
Remove and ignore autogenerated installation instructions
Alexander Klauer [Wed, 19 Dec 2012 08:38:45 +0000 (09:38 +0100)]
Ignore editor swap files
Alexander Klauer [Tue, 18 Dec 2012 17:53:04 +0000 (18:53 +0100)]
Ignore doc dir for now
Alexander Klauer [Tue, 18 Dec 2012 17:46:24 +0000 (18:46 +0100)]
Library is now called libjson-c
Alexander Klauer [Tue, 18 Dec 2012 17:45:39 +0000 (18:45 +0100)]
Need to explicitly remove include/json-c directory
Alexander Klauer [Tue, 18 Dec 2012 17:44:52 +0000 (18:44 +0100)]
-d test is useless as symlinks are dereferenced
Alexander Klauer [Tue, 18 Dec 2012 17:27:39 +0000 (18:27 +0100)]
Ignore valgrind output files
Remi Collet [Thu, 13 Dec 2012 10:46:04 +0000 (11:46 +0100)]
probably worth an option for this
Remi Collet [Thu, 13 Dec 2012 10:22:31 +0000 (11:22 +0100)]
Save space, drop unuseful trailing zeroes
Remi Collet [Thu, 13 Dec 2012 10:16:03 +0000 (11:16 +0100)]
Simple fix to double encode
Remi Collet [Thu, 13 Dec 2012 08:47:33 +0000 (09:47 +0100)]
move locale change to be global for perf
Eric Haszlakiewicz [Sun, 9 Dec 2012 22:32:11 +0000 (16:32 -0600)]
Fix issue #53 - ensure explicit length string are still NUL terminated, and fix json_tokener_parse() to work properly with embedded unicode \u0000 values in strings.
Adjust test_null to check for this case.
See also http://bugs.debian.org/687269
Eric Haszlakiewicz [Sun, 9 Dec 2012 21:46:35 +0000 (15:46 -0600)]
Remove configure as part of maintainer-clean instead of distclean. Addresses issue #48.
Eric Haszlakiewicz [Sun, 9 Dec 2012 21:46:23 +0000 (15:46 -0600)]
Add PACKAGE_URL to config.h.in
Eric Haszlakiewicz [Thu, 29 Nov 2012 20:06:17 +0000 (15:06 -0500)]
Add a missing json_object_get() so we don't try to use a freed object in test1.
Eric Haszlakiewicz [Thu, 29 Nov 2012 19:29:55 +0000 (13:29 -0600)]
Fix a memory leak in the test_printbuf test.
Eric Haszlakiewicz [Thu, 29 Nov 2012 19:23:06 +0000 (13:23 -0600)]
Include json_object_iterator.c in the list of sources.
Remi Collet [Tue, 27 Nov 2012 10:06:49 +0000 (11:06 +0100)]
float parsing must be locale independent
Remi Collet [Tue, 27 Nov 2012 08:01:45 +0000 (09:01 +0100)]
Make maximum recursion depth a runtime option
Eric Haszlakiewicz [Sun, 21 Oct 2012 01:26:37 +0000 (20:26 -0500)]
Make it safe to delete keys while iterating with the json_object_object_foreach macro.
Eric Haszlakiewicz [Sun, 21 Oct 2012 01:10:15 +0000 (20:10 -0500)]
Reformat the json_object_object_foreach macro so it is readable, and document what is allowed to be done with the object while iterating.
Eric Haszlakiewicz [Thu, 18 Oct 2012 22:16:36 +0000 (17:16 -0500)]
Reformat json_object_object_get() and json_object_object_get_ex().
Eric Haszlakiewicz [Thu, 18 Oct 2012 22:14:41 +0000 (17:14 -0500)]
Fix json_object_object_get() so it returns NULL if the incoming json_object is NULL.
Eric Haszlakiewicz [Thu, 18 Oct 2012 22:10:09 +0000 (17:10 -0500)]
Change json_object_put to return 1 if the object passed was actually freed. (or 0 if only the reference count was decremented)
Eric Haszlakiewicz [Mon, 17 Sep 2012 01:49:22 +0000 (20:49 -0500)]
Fix a memory leak in test1 with respect to how json_object_object_del was used.
Eric Haszlakiewicz [Mon, 17 Sep 2012 01:43:29 +0000 (20:43 -0500)]
Reformat the test sources. No functional change.
Eric Haszlakiewicz [Mon, 10 Sep 2012 22:32:14 +0000 (17:32 -0500)]
Fix the home page in the README, and add a list of prerequisites.
Eric Haszlakiewicz [Mon, 10 Sep 2012 02:24:47 +0000 (19:24 -0700)]
Merge pull request #44 from lastquestion/fix_gnu_macosx
Add an autoconf test to test whether the .section .gnu<warning>
Lin Xu [Mon, 10 Sep 2012 00:33:35 +0000 (17:33 -0700)]
Add an autoconf test to test whether the .section .gnu<warning>
works with the linker on the system, and define _warn_references
to nothing if not.
Eric Haszlakiewicz [Sun, 9 Sep 2012 18:53:12 +0000 (13:53 -0500)]
Update the set_serializer test to match the actual output.
Eric Haszlakiewicz [Sun, 2 Sep 2012 20:21:56 +0000 (15:21 -0500)]
Add a json_set_serializer() function to allow the string output of a json_object to be customized.
Eric Haszlakiewicz [Mon, 30 Jul 2012 01:02:00 +0000 (20:02 -0500)]
Add my copyright.
Eric Haszlakiewicz [Mon, 30 Jul 2012 01:00:28 +0000 (20:00 -0500)]
Ignore the tests/testReplaceExisting binary.
Eric Haszlakiewicz [Sun, 29 Jul 2012 23:43:55 +0000 (18:43 -0500)]
Note the rename in the ChangeLog, and update the instructions in the README file.
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.
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.
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.
Eric Haszlakiewicz [Sun, 29 Jul 2012 23:05:08 +0000 (18:05 -0500)]
Add a compatibility symlink json->json-c in the include directory.
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
Eric Haszlakiewicz [Sun, 29 Jul 2012 20:10:30 +0000 (15:10 -0500)]
Ignore a couple more generated files.
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
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.
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.
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)
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
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.
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.
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.