Petri Lehtinen [Fri, 29 Jun 2012 10:11:41 +0000 (13:11 +0300)]
Tweak slash escaping
Petri Lehtinen [Fri, 29 Jun 2012 10:17:55 +0000 (13:17 +0300)]
Merge branch 'fix-slash' of git://github.com/jrbasso/jansson
Fixes #81.
Juan Basso [Fri, 29 Jun 2012 02:04:36 +0000 (22:04 -0400)]
Created flag to dump escaping slash
Juan Basso [Thu, 28 Jun 2012 03:50:01 +0000 (23:50 -0400)]
Escaping the slash when dump
Petri Lehtinen [Wed, 6 Jun 2012 18:10:28 +0000 (21:10 +0300)]
Merge branch '2.3'
Paul Harris [Sun, 3 Jun 2012 18:17:29 +0000 (02:17 +0800)]
Bugfix: must cast void* to do pointer math
Fixes #78.
Paul Harris [Sun, 3 Jun 2012 18:19:35 +0000 (02:19 +0800)]
Bugfix: Changed all use of ssize_t to size_t.
ssize_t is only used in a test, and its comparing to a size_t variable.
Fixes #77.
Petri Lehtinen [Sat, 19 May 2012 18:22:59 +0000 (21:22 +0300)]
Update the documentation to mention Visual Studio 2010 support
Petri Lehtinen [Thu, 3 May 2012 18:31:19 +0000 (11:31 -0700)]
Merge pull request #74 from rogerz/contrib
Add vs2010 solution and project, fix warnings under MinGW
Rogerz Zhang [Mon, 30 Apr 2012 14:32:25 +0000 (22:32 +0800)]
Fix build warnings under MinGW
Rogerz Zhang [Mon, 30 Apr 2012 11:39:45 +0000 (19:39 +0800)]
Add vs2010 solution and project
Petri Lehtinen [Sun, 29 Apr 2012 19:09:29 +0000 (22:09 +0300)]
Support building on Windows
Jansson now builds correctly with Visual C++ Express 2010.
Petri Lehtinen [Thu, 26 Apr 2012 19:11:22 +0000 (22:11 +0300)]
Merge branch '2.3'
Jack Mitchell [Thu, 26 Apr 2012 13:38:37 +0000 (14:38 +0100)]
fix slight typo in json_pack apiref example
Fixes #73.
Petri Lehtinen [Thu, 26 Apr 2012 19:09:48 +0000 (22:09 +0300)]
Merge branch '2.3'
Jack Mitchell [Thu, 26 Apr 2012 13:38:37 +0000 (14:38 +0100)]
fix slight typo in json_pack apiref example
Fixes #73.
Petri Lehtinen [Thu, 26 Apr 2012 06:00:49 +0000 (09:00 +0300)]
Merge branch '2.3'
Petri Lehtinen [Thu, 26 Apr 2012 05:58:31 +0000 (08:58 +0300)]
Check for missing args and envvars in run-tests.sh
Fixes #71.
Petri Lehtinen [Fri, 20 Apr 2012 18:41:25 +0000 (21:41 +0300)]
Merge branch '2.3'
Conflicts:
configure.ac
doc/conf.py
src/jansson.h
Petri Lehtinen [Fri, 20 Apr 2012 18:35:00 +0000 (21:35 +0300)]
jansson 2.3.1
Petri Lehtinen [Wed, 18 Apr 2012 18:59:10 +0000 (21:59 +0300)]
Merge branch '2.3'
Petri Lehtinen [Wed, 18 Apr 2012 18:55:24 +0000 (21:55 +0300)]
Fix tutorial to use Github API v3
The v2 API will be shut down on May 1st 2012.
Fixes #65.
Petri Lehtinen [Wed, 18 Apr 2012 18:27:24 +0000 (21:27 +0300)]
Merge branch '2.3'
Closes #70.
Janne Kulmala [Tue, 17 Apr 2012 08:05:12 +0000 (11:05 +0300)]
load: Change buffer_pos to be a size_t
buffer_pos should be type size_t, because it's used to store the
current position in the read buffer. Also, it never can be negative.
Janne Kulmala [Tue, 17 Apr 2012 07:53:53 +0000 (10:53 +0300)]
load: Avoid unexpected behaviour in macro expansion
Macros can be dangerous if the inserted arguments are not properly
parenthesised. As macro expansion does a simple replacement, inserting
a certain expression can cause the evaluation order of the macro expression
to change.
Petri Lehtinen [Mon, 26 Mar 2012 18:52:01 +0000 (21:52 +0300)]
Document and tweak json_load_callback()
Change the return value of json_load_callback_t to size_t, as it's
feels more correct. The callback should return (size_t)-1 on failure.
Issue #57.
Petri Lehtinen [Sun, 25 Mar 2012 17:46:45 +0000 (10:46 -0700)]
Merge pull request #60 from rogerz/contrib
Ignore the binary test_load_callback
Rogerz [Sun, 25 Mar 2012 13:22:09 +0000 (13:22 +0000)]
Ignore the binary test_load_callback
Petri Lehtinen [Thu, 22 Mar 2012 07:02:51 +0000 (09:02 +0200)]
Merge branch '2.3'
Petri Lehtinen [Thu, 22 Mar 2012 07:02:21 +0000 (09:02 +0200)]
Add json_load_callback to the list of exported symbols
Petri Lehtinen [Thu, 22 Mar 2012 07:00:24 +0000 (00:00 -0700)]
Merge pull request #57 from rogerz/contrib
Add json_load_callback()
Rogerz Zhang [Wed, 21 Mar 2012 08:34:14 +0000 (16:34 +0800)]
Add json_load_callback()
Petri Lehtinen [Thu, 22 Mar 2012 06:48:28 +0000 (08:48 +0200)]
Make test stripping locale independent
Petri Lehtinen [Wed, 21 Mar 2012 12:03:49 +0000 (14:03 +0200)]
Merge branch '2.3'
Closes #56.
Rogerz Zhang [Sun, 18 Mar 2012 11:57:38 +0000 (19:57 +0800)]
Ignore *.exe
Petri Lehtinen [Tue, 20 Mar 2012 18:56:00 +0000 (20:56 +0200)]
Merge branch '2.3'
Petri Lehtinen [Tue, 20 Mar 2012 18:55:55 +0000 (20:55 +0200)]
Update copyright notices for 2012
Petri Lehtinen [Tue, 20 Mar 2012 18:48:36 +0000 (20:48 +0200)]
Merge branch '2.3'
Petri Lehtinen [Tue, 20 Mar 2012 18:46:17 +0000 (20:46 +0200)]
Make sure strtoll() is available when using long long
Petri Lehtinen [Sun, 11 Mar 2012 19:16:41 +0000 (21:16 +0200)]
Merge branch '2.3'
Petri Lehtinen [Sun, 11 Mar 2012 18:50:58 +0000 (20:50 +0200)]
Remove unused declarations
Petri Lehtinen [Thu, 8 Mar 2012 13:03:03 +0000 (15:03 +0200)]
Merge branch '2.3'
Petri Lehtinen [Thu, 8 Mar 2012 13:01:52 +0000 (15:01 +0200)]
Fix tests on shells that don't support the export FOO=bar syntax
Petri Lehtinen [Sun, 12 Feb 2012 14:05:35 +0000 (16:05 +0200)]
Merge branch '2.3'
Petri Lehtinen [Sun, 12 Feb 2012 14:05:27 +0000 (16:05 +0200)]
Disribute the check-exports tests
Petri Lehtinen [Thu, 2 Feb 2012 15:03:03 +0000 (17:03 +0200)]
Merge branch '2.3'
Petri Lehtinen [Thu, 2 Feb 2012 15:00:23 +0000 (17:00 +0200)]
doc: Fix the names of library version constants
Fixes #52.
Petri Lehtinen [Mon, 30 Jan 2012 19:23:49 +0000 (21:23 +0200)]
Merge branch '2.3'
Petri Lehtinen [Mon, 30 Jan 2012 19:23:15 +0000 (21:23 +0200)]
Make test_load.c not depend on the C locale
Fixes #51.
Petri Lehtinen [Mon, 30 Jan 2012 18:59:32 +0000 (20:59 +0200)]
Set master to 2.4 development mode
Petri Lehtinen [Fri, 27 Jan 2012 19:02:12 +0000 (21:02 +0200)]
jansson 2.3
Petri Lehtinen [Thu, 26 Jan 2012 19:13:07 +0000 (21:13 +0200)]
Add support for optional object keys for json_unpack() and friends
Initial patch by Andrew Thompson.
Petri Lehtinen [Tue, 24 Jan 2012 19:03:36 +0000 (21:03 +0200)]
Add json_object_update_{existing,missing}
Closes #37.
Petri Lehtinen [Tue, 24 Jan 2012 18:37:08 +0000 (20:37 +0200)]
Implement json_object_foreach()
Also change many places to use it internally to replace hand-crafted
iteration.
Closes #45, #46.
Petri Lehtinen [Tue, 24 Jan 2012 18:36:31 +0000 (20:36 +0200)]
Make hashtable less generic
This will make it possible to implement json_object_foreach(). It
should also have some (positive) effect on speed.
Petri Lehtinen [Tue, 24 Jan 2012 18:35:59 +0000 (20:35 +0200)]
Fix a potential memory leak
Petri Lehtinen [Mon, 23 Jan 2012 19:18:04 +0000 (21:18 +0200)]
Write number of bytes read to error position on successful decode
Closes #49.
Petri Lehtinen [Mon, 14 Nov 2011 19:16:42 +0000 (21:16 +0200)]
Merge branch '2.2'
Petri Lehtinen [Mon, 14 Nov 2011 19:15:17 +0000 (21:15 +0200)]
Revert "json_dump_file: Open the output file in wb mode"
JSON is read as text, so line endings should be preserved.
This reverts commit
32cd82127390b9fd5b5d090bc3c279d3e4d9f3a6.
Petri Lehtinen [Mon, 14 Nov 2011 19:11:18 +0000 (21:11 +0200)]
Merge branch '2.2'
Closes GH-43.
Petri Lehtinen [Mon, 14 Nov 2011 10:58:37 +0000 (12:58 +0200)]
Update the documentation of JSON_DECODE_ANY
Andrea Marchesini [Fri, 11 Nov 2011 18:17:29 +0000 (19:17 +0100)]
JSON_DECODE_ANY
Closes GH-4.
Petri Lehtinen [Mon, 14 Nov 2011 17:32:42 +0000 (19:32 +0200)]
doc: The same JSON values must not be encoded in parallel
Closes GH-42.
Petri Lehtinen [Mon, 14 Nov 2011 17:10:28 +0000 (19:10 +0200)]
Avoid problems with object's serial number growing too big
Transform serial key comparison from substraction to real comparison.
Reset serial to zero in json_object_clear() to avoid it growing out of
bounds when reusing objects.
Closes GH-40.
Closes GH-41.
Andrea Marchesini [Fri, 11 Nov 2011 18:17:50 +0000 (19:17 +0100)]
json_load* return NULL if the first argument is NULL
Petri Lehtinen [Wed, 2 Nov 2011 06:01:32 +0000 (08:01 +0200)]
doc: The configure script can be used on MinGW
Petri Lehtinen [Wed, 2 Nov 2011 05:56:33 +0000 (07:56 +0200)]
Distribute jansson_config.h.win32
Petri Lehtinen [Tue, 1 Nov 2011 18:49:15 +0000 (20:49 +0200)]
Remove '+' and leading zeros from exponents in the encoder
Fixes GH-39.
Petri Lehtinen [Tue, 1 Nov 2011 17:52:20 +0000 (19:52 +0200)]
Fix test file comparisons on MinGW
Don't output any DOS line terminators from json_process.
Issue GH-39.
Petri Lehtinen [Tue, 1 Nov 2011 17:41:25 +0000 (19:41 +0200)]
Use %I64d format for printing long longs on Windows
Fixes GH-38.
Petri Lehtinen [Fri, 7 Oct 2011 17:52:49 +0000 (20:52 +0300)]
json_dump_file: Open the output file in wb mode
For maximum compatibility.
Petri Lehtinen [Thu, 6 Oct 2011 18:16:26 +0000 (21:16 +0300)]
jansson 2.2.1
Petri Lehtinen [Thu, 6 Oct 2011 18:22:59 +0000 (21:22 +0300)]
Distribute doc/portability.rst
Petri Lehtinen [Tue, 4 Oct 2011 18:11:26 +0000 (21:11 +0300)]
json_load_file: Open the input file in rb mode
For maximum compatibility.
Petri Lehtinen [Tue, 4 Oct 2011 18:04:56 +0000 (21:04 +0300)]
Documentation fixes
Petri Lehtinen [Mon, 3 Oct 2011 19:42:39 +0000 (22:42 +0300)]
doc: Add project status to introduction, add portability chapter
Move the multithreading-and-setlocale documentation to the new
portability chapter.
Fixes GH-36.
Petri Lehtinen [Mon, 3 Oct 2011 18:35:51 +0000 (21:35 +0300)]
Make identifier decoding work under all locales
Replace isxxx() functions from ctype.h with locale-independent macros.
Fixes GH-35.
Petri Lehtinen [Mon, 3 Oct 2011 05:52:30 +0000 (08:52 +0300)]
Use strchr() when searching for a single character
Petri Lehtinen [Sun, 2 Oct 2011 18:27:53 +0000 (21:27 +0300)]
Make real number encoding and decoding work under all locales
The decimal point '.' is changed to locale's decimal point
before/after JSON conversion to make C standard library's
locale-specific string conversion functions work correctly.
All the tests now call setlocale(LC_ALL, "") on startup to use the
locale set in the environment.
Fixes GH-32.
Petri Lehtinen [Sat, 24 Sep 2011 18:10:23 +0000 (21:10 +0300)]
Implement all other encoding functions using json_dump_callback
This way we can check for JSON_ENCODE_ANY flag in one place only.
Petri Lehtinen [Tue, 20 Sep 2011 18:11:55 +0000 (11:11 -0700)]
Merge pull request #33 from bakulf/master
Little fixes
Andrea Marchesini [Tue, 20 Sep 2011 11:10:32 +0000 (13:10 +0200)]
scope error. result points to a out-of-score variable.
Andrea Marchesini [Tue, 20 Sep 2011 09:46:29 +0000 (11:46 +0200)]
unsed static variable removed
Petri Lehtinen [Mon, 12 Sep 2011 18:22:19 +0000 (21:22 +0300)]
doc: Clarify the result of 's' format of json_unpack()
Fixes GH-31.
Petri Lehtinen [Fri, 2 Sep 2011 18:39:32 +0000 (21:39 +0300)]
jansson 2.2
Petri Lehtinen [Fri, 2 Sep 2011 18:29:01 +0000 (21:29 +0300)]
doc: json_dump_callback was added in v2.2
Petri Lehtinen [Mon, 8 Aug 2011 18:00:47 +0000 (21:00 +0300)]
Merge branch '2.1'
Petri Lehtinen [Mon, 8 Aug 2011 17:59:10 +0000 (20:59 +0300)]
doc: Explain the non-constness of the first parameter of json_unpack() et al
Fixes GH-30.
Petri Lehtinen [Thu, 30 Jun 2011 18:48:51 +0000 (21:48 +0300)]
Merge branch '2.1'
Petri Lehtinen [Thu, 30 Jun 2011 18:48:09 +0000 (21:48 +0300)]
Merge branch 'issue-29'
Fixes GH-29.
Petri Lehtinen [Thu, 30 Jun 2011 18:45:25 +0000 (21:45 +0300)]
doc: Add documentation for json_dump_callback()
JKL [Fri, 24 Jun 2011 17:40:20 +0000 (10:40 -0700)]
test file for new json_dump_callback function
JKL [Fri, 24 Jun 2011 17:00:53 +0000 (10:00 -0700)]
new typedef json_dump_callback_t, function json_dump_callback
Petri Lehtinen [Thu, 30 Jun 2011 18:04:45 +0000 (21:04 +0300)]
doc: Fix several typos and other little errors
JKL [Fri, 24 Jun 2011 16:57:20 +0000 (09:57 -0700)]
use size_t for strbuffer writes, and avoid integer overflow
Petri Lehtinen [Fri, 17 Jun 2011 18:42:11 +0000 (21:42 +0300)]
Check that target is string and value is not NULL in json_string_set()
Petri Lehtinen [Fri, 17 Jun 2011 17:53:28 +0000 (20:53 +0300)]
doc: Clarify that removing from containers decrements the refcount
While at it, reword the object iteration protocol description a bit.
Petri Lehtinen [Fri, 10 Jun 2011 18:53:14 +0000 (21:53 +0300)]
CHANGES: Fix v2.1 release date
Petri Lehtinen [Fri, 10 Jun 2011 18:30:11 +0000 (21:30 +0300)]
jansson 2.1
Petri Lehtinen [Tue, 7 Jun 2011 18:39:55 +0000 (21:39 +0300)]
Use ``literal`` syntax with macro and flag names in CHANGES