Petri Lehtinen
b6d0191e51
Implement all other encoding functions using json_dump_callback
...
This way we can check for JSON_ENCODE_ANY flag in one place only.
2011-09-24 21:10:34 +03:00
Petri Lehtinen
2a70d62251
Merge pull request #33 from bakulf/master
...
Little fixes
2011-09-20 11:11:55 -07:00
Andrea Marchesini
909874b1b9
scope error. result points to a out-of-score variable.
2011-09-20 13:10:32 +02:00
Andrea Marchesini
ff57dee13d
unsed static variable removed
2011-09-20 11:46:29 +02: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
d43464a1ec
Merge branch 'issue-29'
...
Fixes GH-29.
2011-06-30 21:48:33 +03:00
Petri Lehtinen
c7079a25eb
doc: Add documentation for json_dump_callback()
2011-06-30 21:47:37 +03:00
JKL
54f38d250c
test file for new json_dump_callback function
2011-06-30 21:47:12 +03:00
JKL
c7d543d36c
new typedef json_dump_callback_t, function json_dump_callback
2011-06-30 21:47:12 +03:00
Petri Lehtinen
7fab57dcef
doc: Fix several typos and other little errors
2011-06-30 21:04:49 +03:00
JKL
cd9757512d
use size_t for strbuffer writes, and avoid integer overflow
2011-06-30 20:45:18 +03:00
Petri Lehtinen
c0193bfb7f
Check that target is string and value is not NULL in json_string_set()
2011-06-17 21:42:19 +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
1358d0bfac
CHANGES: Fix v2.1 release date
2011-06-10 21:53:14 +03:00
Petri Lehtinen
86d17a8dc2
jansson 2.1
2011-06-10 21:30:11 +03:00
Petri Lehtinen
3988ab2d27
Use `literal
` syntax with macro and flag names in CHANGES
2011-06-07 21:40:09 +03:00
Petri Lehtinen
f7f7bf5ab2
Prepare for relase: Add CHANGES entry for v2.1
2011-06-07 21:33:59 +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
9febdf333c
Reduce code duplication in the decoder
2011-05-29 12:53:25 +03:00
Petri Lehtinen
013b8b3f60
Clear errno before calling strtod()
...
Fixes GH-27.
2011-05-24 09:59:41 +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
c3492973e1
Merge branch '2.0'
2011-04-21 13:15:58 +03:00
Petri Lehtinen
e20619e071
Fix a leak when memory allocation fails in json_object_set() & friends
2011-04-21 13:15:22 +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
76d6d700ad
Merge branch '2.0'
2011-04-05 15:38:37 +03:00
Jim Meyering
c96763215d
Avoid set-but-not-used warning/error in a test
...
Closes GH-20.
2011-04-05 15:36:13 +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
056702e541
Merge branch '2.0'
2011-03-31 16:39:33 +03:00
Petri Lehtinen
eab23f05d8
Fix a few malloc() and free() calls
...
Replace them with jsonp_malloc() and jsonp_free() to support the
custom memory allocation.
2011-03-31 16:37:43 +03:00
Petri Lehtinen
0944ac8d91
Fix invalid object key hashing in json_unpack() strict checking mode
...
The keys which are stored temporarily to a hashtable to make sure that
all object keys are unpacked, were hashed with the object key hashing
function. It is meant to compute hashes for object_key_t values, and
it works incorrectly for plain strings.
Fixed by introducing suitable functions for hashing and comparing
strings for string-keyed hashtables.
2011-03-30 12:57:48 +03:00
Petri Lehtinen
a5a43caa9a
Merge branch '2.0'
2011-03-27 21:04:29 +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
279d8bf108
Use the correct number of parens in JANSSON_VERSION_HEX macro
2011-03-27 14:12:40 +03:00
Petri Lehtinen
38e35e0973
Test framework enhancements, fix the check_exports test
...
* Use "printf" instead of "echo -n" as it's more portable
* Treat a test as skipped if it exits with exit status of 77
* Skip the check_exports test if "nm -D" doesn't work
2011-03-27 13:34:43 +03:00
Petri Lehtinen
af18578928
Use the correct number of parens in JANSSON_VERSION_HEX macro
2011-03-23 08:25:50 +02:00
Petri Lehtinen
c30e92603c
ANSI C requires struct initializers to be constant expressions
...
Closes GH-17.
2011-03-21 09:28:14 +02:00
Petri Lehtinen
6ecba84817
Fix json_object_size() return value
...
Return 0 as documented if the argument is not a JSON object.
Closes GH-18.
2011-03-21 08:22:34 +02:00
Petri Lehtinen
b90ed1accb
Enhance portability of va_copy()
...
va_copy() is a C99 feature. In C89 implementations, it's sometimes
available as __va_copy(). If not, memcpy() should do the trick.
2011-03-20 21:23:37 +02:00
Petri Lehtinen
1111960120
Fix a declaration after statement
...
While at it, add -Wdeclaration-after-statement to AM_CFLAGS to catch
these in the future.
2011-03-10 21:28:53 +02:00
Petri Lehtinen
7f09f48e7e
Distribute doc/upgrading.rst
...
Closes GH-16.
2011-03-10 21:26:18 +02:00