Petri Lehtinen
34d8b92dce
Merge branch '2.5'
2013-11-14 08:49:24 +02:00
Petri Lehtinen
67a7bc7376
doc: Set all memory to zero in secure_free
2013-11-14 08:49:16 +02:00
Petri Lehtinen
f8d8d524cf
Document JSON_ALLOW_NUL and clarify NUL byte handling
2013-09-30 10:55:34 +03:00
Petri Lehtinen
5744468c99
Clarify json_string_length doc
2013-09-30 10:45:02 +03:00
Petri Lehtinen
7876125a22
Document s% and s# for json_pack, s% for json_unpack
2013-09-30 08:47:05 +03:00
Chip Salzenberg
0be5c959da
document new null-friendly functions
2013-09-27 19:10:32 -07:00
Petri Lehtinen
e4d6a9f6f4
Add versionadded to the new json_pack() format specifiers
2013-09-23 09:34:28 +03:00
Petri Lehtinen
641002da37
jansson 2.5
2013-09-19 21:26:46 +03:00
Petri Lehtinen
9f9c9fe410
doc: Fix index type for json_array_foreach()
2013-09-19 21:26:46 +03:00
Petri Lehtinen
24c67966aa
Mention success first in json_load_callback_t docs
2013-09-16 08:49:38 +03:00
Phillip Howell
0747d3943f
Clarified json_load_callback_t return value docs
2013-09-16 08:49:38 +03:00
Petri Lehtinen
3196ad48ed
pack: Add format specifiers s#, + and +#
2013-08-14 21:54:11 +03:00
Petri Lehtinen
49ad5328c7
doc: Add an example for circumventing problems with Windows heaps
2013-08-06 08:12:20 +03:00
Petri Lehtinen
71676acd0b
Fix memory leaks and warnings in github_commits.c
2013-07-27 21:23:34 +03:00
Petri Lehtinen
2489ea90b1
Update copyrights for 2013
2013-07-23 13:20:06 +03:00
Petri Lehtinen
8490e377c0
Make the argument of json_deep_copy() const
...
Fixes #126 .
2013-07-08 12:36:56 +03:00
Petri Lehtinen
a38704df58
Fix indentation in docs
2013-06-12 08:30:28 +03:00
Jason Choy
120a90a155
Using jsonp_strtod instead of casting to double to catch double overflow
2013-06-11 15:09:08 +01:00
Jason Choy
c3e9725f02
Changed :versionadded for JSON_DECODE_INT_AS_REAL docs
2013-06-11 12:31:41 +01:00
Jason Choy
02a3829363
Renamed flag to JSON_DECODE_INT_AS_REAL and added documentation
2013-06-11 12:24:28 +01:00
Daniel Griscom
b49280be72
Fixed "comparison between signed and unsigned" warning
2013-05-12 15:45:33 -04:00
Daniel Griscom
e8c812b500
Added test cases and documentation for json_array_foreach()
2013-05-12 15:34:26 -04:00
Andrei Epure
f675514815
jansson:doc: modified incref doc
...
Signed-off-by: Andrei Epure <epure.andrei@gmail.com>
2013-04-29 15:32:52 +03:00
Joakim Soderberg
0687442f5d
Fixed some minor issues.
2013-04-25 13:59:26 +00:00
Joakim Soderberg
8390c90a91
Added more detailed CMake documentation.
...
- Also added better FindSphinx support so that we can detect the version and not have a fatal error if it's too old.
- Added support for building latex documentation with -DBUILD_LATEX. Off by default.
- Added suppor for building man pages with -DBUILD_MAN. On by default (unless sphins is too old to support it).
2013-04-24 14:14:00 +00:00
Petri Lehtinen
6b1cba94e3
Document CMake build process, deprecate the VS2010 project
2013-04-15 10:31:23 +03:00
Petri Lehtinen
9591d3a155
Tweak Android build documentation
2013-04-15 10:25:32 +03:00
Petri Lehtinen
83d04ddd68
Merge branch 'master' of git://github.com/svic/jansson
2013-04-15 10:21:31 +03:00
Garner Lee
d20751d53d
Add android doc.
2013-04-11 13:32:04 -07:00
Petri Lehtinen
8fd475bf96
Merge branch '2.4'
2013-04-01 14:41:14 +03:00
Petri Lehtinen
bbd3b0ca4f
Fix a typo
2013-04-01 14:41:10 +03:00
Petri Lehtinen
a3e6369105
Merge branch '2.4'
2013-03-09 21:15:22 +02:00
Petri Lehtinen
3d0d61fdaf
Use json_decref() properly in tutorial
2013-03-09 21:15:09 +02:00
Petri Lehtinen
5804e9de9b
Set master for 2.5 development mode
2012-09-23 13:41:40 +03:00
Petri Lehtinen
3279aacdee
jansson 2.4
2012-09-23 12:52:41 +03:00
Petri Lehtinen
597423ea80
doc: Add versionadded directive for json_boolean()
2012-09-22 14:25:29 +03:00
Petri Lehtinen
23d563434a
Fix a typo on doc/apiref.rst
2012-09-06 12:06:41 +03:00
Petri Lehtinen
b6a1d8cfd4
Add json_boolean() macro
...
Mostly for symmetry reasons. Makes it easier e.g. to:
int ok = 0;
if(something)
ok = 1;
json_object_set_new(obj, "ok", json_boolean(ok));
Fixes #86 .
2012-07-30 07:20:37 +03:00
Petri Lehtinen
52924288b9
Merge branch '2.3'
2012-07-27 07:28:40 +03:00
Petri Lehtinen
7892ecce1c
Fix a small error in tutorial
...
Fixes #84 .
2012-07-27 07:28:18 +03:00
Petri Lehtinen
a501a39626
Document the JSON_ESCAPE_SLASH encoding flag
2012-06-29 13:32:17 +03:00
Petri Lehtinen
c0139681cd
Update the documentation to mention Visual Studio 2010 support
2012-05-19 21:22:59 +03:00
Jack Mitchell
c7f86abf6d
fix slight typo in json_pack apiref example
...
Fixes #73 .
2012-04-26 22:10:46 +03:00
Petri Lehtinen
f309e30320
Merge branch '2.3'
2012-04-26 22:09:48 +03:00
Jack Mitchell
233574e8e0
fix slight typo in json_pack apiref example
...
Fixes #73 .
2012-04-26 22:09:29 +03:00
Petri Lehtinen
ff6e6ee293
jansson 2.3.1
2012-04-20 21:35:00 +03:00
Petri Lehtinen
8b2bfd5586
Merge branch '2.3'
2012-04-18 21:59:10 +03:00
Petri Lehtinen
e46b912f53
Fix tutorial to use Github API v3
...
The v2 API will be shut down on May 1st 2012.
Fixes #65 .
2012-04-18 21:58:52 +03:00
Petri Lehtinen
e8fd3e3085
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 .
2012-03-26 21:53:21 +03:00
Petri Lehtinen
d286e7b753
Merge branch '2.3'
2012-03-20 20:56:00 +02:00
Petri Lehtinen
3c6e36ba2d
Update copyright notices for 2012
2012-03-20 20:55:55 +02:00
Petri Lehtinen
98a99fb2bd
Merge branch '2.3'
2012-02-02 17:03:03 +02:00
Petri Lehtinen
ac97f6f225
doc: Fix the names of library version constants
...
Fixes #52 .
2012-02-02 17:00:35 +02:00
Petri Lehtinen
a894980258
Set master to 2.4 development mode
2012-01-30 20:59:32 +02:00
Petri Lehtinen
f227483846
jansson 2.3
2012-01-27 21:02:12 +02:00
Petri Lehtinen
6cb14dd337
Add support for optional object keys for json_unpack() and friends
...
Initial patch by Andrew Thompson.
2012-01-26 21:16:36 +02:00
Petri Lehtinen
fa268b5017
Add json_object_update_{existing,missing}
...
Closes #37 .
2012-01-24 21:03:36 +02:00
Petri Lehtinen
a307974731
Implement json_object_foreach()
...
Also change many places to use it internally to replace hand-crafted
iteration.
Closes #45 , #46 .
2012-01-24 21:01:24 +02:00
Petri Lehtinen
f471e63bb3
Write number of bytes read to error position on successful decode
...
Closes #49 .
2012-01-23 21:18:04 +02:00
Petri Lehtinen
bef87fc258
Merge branch '2.2'
...
Closes GH-43.
2011-11-14 21:11:18 +02:00
Petri Lehtinen
68d6410da0
Update the documentation of JSON_DECODE_ANY
2011-11-14 21:10:16 +02:00
Andrea Marchesini
1e36667193
JSON_DECODE_ANY
...
Closes GH-4.
2011-11-14 21:10:09 +02:00
Petri Lehtinen
0931d938b0
doc: The same JSON values must not be encoded in parallel
...
Closes GH-42.
2011-11-14 21:01:34 +02:00
Petri Lehtinen
72cd84b92a
doc: The configure script can be used on MinGW
2011-11-02 08:01:49 +02:00
Petri Lehtinen
9c6cb42f17
jansson 2.2.1
2011-10-06 21:23:09 +03:00
Petri Lehtinen
ed06777937
Distribute doc/portability.rst
2011-10-06 21:23:09 +03:00
Petri Lehtinen
84f739036d
Documentation fixes
2011-10-04 21:04:56 +03:00
Petri Lehtinen
0f358c8eaa
doc: Add project status to introduction, add portability chapter
...
Move the multithreading-and-setlocale documentation to the new
portability chapter.
Fixes GH-36.
2011-10-03 22:42:39 +03:00
Petri Lehtinen
d7ddbf3661
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.
2011-10-02 21:31:17 +03:00
Petri Lehtinen
e4cc77ce52
doc: Clarify the result of 's' format of json_unpack()
...
Fixes GH-31.
2011-09-12 21:22:20 +03:00
Petri Lehtinen
889f295958
jansson 2.2
2011-09-02 21:39:40 +03:00
Petri Lehtinen
68809cd913
doc: json_dump_callback was added in v2.2
2011-09-02 21:29:01 +03:00
Petri Lehtinen
910fb92267
Merge branch '2.1'
2011-08-08 21:00:47 +03:00
Petri Lehtinen
f241e14cab
doc: Explain the non-constness of the first parameter of json_unpack() et al
...
Fixes GH-30.
2011-08-08 20:59:10 +03:00
Petri Lehtinen
7e9c293986
Merge branch '2.1'
2011-06-30 21:48:51 +03:00
Petri Lehtinen
c7079a25eb
doc: Add documentation for json_dump_callback()
2011-06-30 21:47:37 +03:00
Petri Lehtinen
7fab57dcef
doc: Fix several typos and other little errors
2011-06-30 21:04:49 +03:00
Petri Lehtinen
6e1f4bb560
doc: Clarify that removing from containers decrements the refcount
...
While at it, reword the object iteration protocol description a bit.
2011-06-17 20:53:32 +03:00
Petri Lehtinen
86d17a8dc2
jansson 2.1
2011-06-10 21:30:11 +03:00
Petri Lehtinen
a76ba52f34
Add JSON_DISABLE_EOF_CHECK decoding flag
...
With this flag enabled, the decoder stops after a valid JSON input and
thus allows extra data after it.
Fixes GH-25.
2011-05-29 21:27:15 +03:00
Petri Lehtinen
49fc708d4c
Add JSON_REJECT_DUPLICATES decoding flag
...
With this flag, a decoding error is issued if any JSON object in the
input contains duplicate keys.
Fixes GH-3.
2011-05-15 13:57:49 +03:00
Petri Lehtinen
92f6f0f22c
doc: Clarify that Unicode normalization or comparison algorithms are not used
2011-05-15 12:39:10 +03:00
Petri Lehtinen
e9e34f430e
doc: Add "New in version 2.1" notes to new features
2011-05-14 20:52:14 +03:00
Petri Lehtinen
ab723c7fb5
docs: Add a note that object iteration doesn't give any particular order
...
Closes GH-15.
2011-05-14 13:04:35 +03:00
Petri Lehtinen
636d5f60f9
Add JSON_ENCODE_ANY flag to allow encoding any JSON value
...
Closes GH-19.
2011-05-14 12:57:12 +03:00
Petri Lehtinen
b44e2be032
Add json_loadb() for decoding possibly non null-terminated strings
...
Thanks to Jonathan Landis for the initial patch.
2011-04-10 21:01:50 +03:00
Petri Lehtinen
4a76900bd7
Merge branch '2.0'
...
Conflicts:
doc/conf.py
src/jansson.h
2011-03-31 21:26:19 +03:00
Petri Lehtinen
1c0a3b2a55
jansson 2.0.1
2011-03-31 16:59:26 +03:00
Petri Lehtinen
5456fc59ab
Set JANSSON_MICRO_VERSION to 255 (0xFF) for git master
...
Also, set documentation release to "2.0+git". This shows up in the
automatically built HTML documentation.
These changes makes it easier for library users to know that this
version is under development.
Closes GH-14.
2011-03-27 21:03:04 +03:00
Petri Lehtinen
7f09f48e7e
Distribute doc/upgrading.rst
...
Closes GH-16.
2011-03-10 21:26:18 +02:00
Petri Lehtinen
cf9b384bcb
jansson 2.0
2011-02-28 20:46:14 +02:00
Petri Lehtinen
b5dd566c83
doc: Change the title of the upgrading section
2011-02-25 21:01:13 +02:00
Petri Lehtinen
ff26dc60d1
Small documentation tweaks
...
- Capitalize section titles correctly
- Rename "Building on Windows" to "Building on non-Unix systems" and
tweak the text accordingly.
- Remove the "Installing Prebuilt Binaries" section. This info is
better in the web instead, as it may change.
- Mention that Sphinx 1.0 or newer is required.
2011-02-24 22:35:02 +02:00
Petri Lehtinen
53bc9d8a39
Add "Upgrading from older releases" to docs, tweak CHANGES a bit
2011-02-24 22:15:13 +02:00
Petri Lehtinen
58f9d65535
Add lots of tests for pack/unpack code, fix bugs found
...
Closes GH-12.
2011-02-22 19:08:51 +02:00
Petri Lehtinen
a33c3628da
Move json_error_t documentation to its own section
...
json_error_t is used in the decoder and in the pack and unpack API's,
so it's better to have a separate section for it.
2011-02-22 13:53:58 +02:00
Petri Lehtinen
5df7b79397
Refactor decoder input stream
...
- Add a new field position to the json_error_t structure. This is the
position in bytes from the beginning of the input.
- Keep track of line, column and input position in the stream level.
Previously, only line was tracked, and it was in the lexer level, so
this info was not available for UTF-8 decoding errors.
- While at it, refactor tests so that no separate "stripped" tests are
required. json_process is now able to strip whitespace from its
input, and the "valid" and "invalid" test suites now use this to
test both non-stripped and stripped input.
Closes GH-9.
2011-02-22 12:07:37 +02:00
Petri Lehtinen
4be9e9e7fe
Add custom memory allocation
...
Thanks to Basile Starynkevitch for the suggestion and initial patch.
Thanks to Jonathan Landis and Deron Meranda for showing how this can
be utilized for implementing secure memory operations.
2011-02-17 10:10:53 +02:00
Petri Lehtinen
f25698d08f
Fix an unpack example in the docs
2011-01-30 12:53:54 +02:00
Petri Lehtinen
ef13fb9189
Tweak the default validation behaviour of the unpack API
...
Now, by default, unpacking doesn't check that all array and object
items are accessed. The check can be enabled globally by using the
JSON_STRICT flag (formerly JSON_UNPACK_ONLY), or on a per-value basis
by using the new '!' format character. The '*' format character is
still available to disable the global check on a per-value basis.
2011-01-29 21:38:07 +02:00
