Petri Lehtinen
4118315afa
Disallow NaN or Inf real values
2012-09-13 21:30:19 +03:00
Petri Lehtinen
ee13c667f1
Fix json_real_set() to return -1 on error
2012-09-13 08:46:56 +03:00
Petri Lehtinen
23d563434a
Fix a typo on doc/apiref.rst
2012-09-06 12:06:41 +03:00
Petri Lehtinen
6142dbd8d0
Fix a typo in README.rst
2012-09-05 21:16:43 +03:00
Petri Lehtinen
0dac319bc4
CHANGES entry for #88
2012-08-11 20:45:25 +03:00
Petri Lehtinen
0b871a113c
Merge branch '2.3'
2012-08-11 20:45:15 +03:00
Alessandro Ghedini
8176527f56
fix check-exports test on ppc64
2012-08-11 20:42:21 +03:00
Petri Lehtinen
ec7bb71d75
Add an initial CHANGES entry for v2.4
2012-07-30 07:52: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
37bc3bbf4b
Tweak slash escaping
2012-06-29 13:25:02 +03:00
Petri Lehtinen
2d46ea069b
Merge branch 'fix-slash' of git://github.com/jrbasso/jansson
...
Fixes #81 .
2012-06-29 13:24:55 +03:00
Juan Basso
b217cd6689
Created flag to dump escaping slash
2012-06-28 22:04:36 -04:00
Juan Basso
a0c262d08b
Escaping the slash when dump
2012-06-27 23:54:08 -04:00
Petri Lehtinen
6ce273e2e6
Merge branch '2.3'
2012-06-06 21:10:28 +03:00
Paul Harris
f62b1f5d69
Bugfix: must cast void* to do pointer math
...
Fixes #78 .
2012-06-06 21:09:47 +03:00
Paul Harris
2b87fdcb43
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 .
2012-06-06 08:47:17 +03:00
Petri Lehtinen
c0139681cd
Update the documentation to mention Visual Studio 2010 support
2012-05-19 21:22:59 +03:00
Petri Lehtinen
9d6f9511f5
Merge pull request #74 from rogerz/contrib
...
Add vs2010 solution and project, fix warnings under MinGW
2012-05-03 11:31:19 -07:00
Rogerz Zhang
a79f64e155
Fix build warnings under MinGW
2012-05-01 08:02:12 +08:00
Rogerz Zhang
7ca783c3bc
Add vs2010 solution and project
2012-04-30 21:51:07 +08:00
Petri Lehtinen
ff0c05b8f1
Support building on Windows
...
Jansson now builds correctly with Visual C++ Express 2010.
2012-04-29 22:09:29 +03:00
Petri Lehtinen
4601bf71e5
Merge branch '2.3'
2012-04-26 22:11:22 +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
4a6939ef87
Merge branch '2.3'
2012-04-26 09:00:49 +03:00
Petri Lehtinen
42bc7a3c50
Check for missing args and envvars in run-tests.sh
...
Fixes #71 .
2012-04-26 08:58:36 +03:00
Petri Lehtinen
abdb8d99d7
Merge branch '2.3'
...
Conflicts:
configure.ac
doc/conf.py
src/jansson.h
2012-04-20 21:41:25 +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
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
