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
1581f26a7f
Merge branch '2.3'
...
Closes #70 .
2012-04-18 21:27:26 +03:00
Janne Kulmala
aabfd493d3
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.
2012-04-18 21:21:17 +03:00
Janne Kulmala
bd72efbd80
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.
2012-04-18 21:21:17 +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
873eddaf19
Merge pull request #60 from rogerz/contrib
...
Ignore the binary test_load_callback
2012-03-25 10:46:45 -07:00
Rogerz
bd2c0c730d
Ignore the binary test_load_callback
2012-03-25 13:22:09 +00:00
Petri Lehtinen
17a51a4bf0
Merge branch '2.3'
2012-03-22 09:02:51 +02:00
Petri Lehtinen
09c39adc55
Add json_load_callback to the list of exported symbols
2012-03-22 09:02:49 +02:00
Petri Lehtinen
cbb80baf03
Merge pull request #57 from rogerz/contrib
...
Add json_load_callback()
2012-03-22 00:00:24 -07:00
Rogerz Zhang
040bd7b0fa
Add json_load_callback()
2012-03-22 14:52:57 +08:00
Petri Lehtinen
2637faa450
Make test stripping locale independent
2012-03-22 08:48:28 +02:00
Petri Lehtinen
952e1d4ba9
Merge branch '2.3'
...
Closes #56 .
2012-03-21 14:03:51 +02:00
Rogerz Zhang
353b5e08ba
Ignore *.exe
2012-03-21 14:03:46 +02: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
9af64480e1
Merge branch '2.3'
2012-03-20 20:48:36 +02:00
Petri Lehtinen
4ae5736bd0
Make sure strtoll() is available when using long long
2012-03-20 20:47:57 +02:00
Petri Lehtinen
56039ed596
Merge branch '2.3'
2012-03-11 21:16:41 +02:00
Petri Lehtinen
02b915af54
Remove unused declarations
2012-03-11 21:12:52 +02:00
Petri Lehtinen
1eb274c555
Merge branch '2.3'
2012-03-08 15:03:03 +02:00
Petri Lehtinen
6ac6f311b5
Fix tests on shells that don't support the export FOO=bar syntax
2012-03-08 15:01:52 +02:00
Petri Lehtinen
f736e705b2
Merge branch '2.3'
2012-02-12 16:05:35 +02:00
Petri Lehtinen
54d88753a6
Disribute the check-exports tests
2012-02-12 16:05:27 +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
60fd7ab781
Merge branch '2.3'
2012-01-30 21:23:49 +02:00
Petri Lehtinen
0d64e8ef89
Make test_load.c not depend on the C locale
...
Fixes #51 .
2012-01-30 21:23:18 +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
a2381948bb
Make hashtable less generic
...
This will make it possible to implement json_object_foreach(). It
should also have some (positive) effect on speed.
2012-01-24 21:01:23 +02:00
Petri Lehtinen
5eb2c442a9
Fix a potential memory leak
2012-01-24 20:35:59 +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
bb24697d9b
Merge branch '2.2'
2011-11-14 21:16:42 +02:00
Petri Lehtinen
c4a7bf90cf
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 32cd821273
2011-11-14 21:16:36 +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
0f2cdd70ff
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.
2011-11-14 21:01:13 +02:00
Andrea Marchesini
5ec101ec21
json_load* return NULL if the first argument is NULL
2011-11-14 20:57:41 +02:00
Petri Lehtinen
72cd84b92a
doc: The configure script can be used on MinGW
2011-11-02 08:01:49 +02:00
Petri Lehtinen
6799c8e4c9
Distribute jansson_config.h.win32
2011-11-02 07:57:19 +02:00
Petri Lehtinen
8484ea3fb2
Remove '+' and leading zeros from exponents in the encoder
...
Fixes GH-39.
2011-11-01 20:50:16 +02:00
Petri Lehtinen
92d9b89d59
Fix test file comparisons on MinGW
...
Don't output any DOS line terminators from json_process.
Issue GH-39.
2011-11-01 20:49:52 +02:00
