]>
granicus.if.org Git - json-c/log
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
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.
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.
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.
Keith Derrick [Fri, 30 Mar 2012 19:34:01 +0000 (12:34 -0700)]
Ignoring additional build products
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.
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 [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.