organicmaps/jansson
13
Fork 0
mirror of https://github.com/akheron/jansson.git synced 2025-04-20 03:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions
865 commits 32 branches 32 tags 3.4 MiB
Commit graph

388 commits

Author SHA1 Message Date
Petri Lehtinen
50031440a3 Implement JSON_ENSURE_ASCII encoding flag 
With this flag, all Unicode characters outside the ASCII range are
escaped.
 2009-12-05 22:55:30 +02:00
Petri Lehtinen
d67aeb9739 Use int32_t instead of plain int with Unicode code points 
On some architectures, int just isn't big enough to hold all Unicode
code points.
 2009-12-02 23:53:54 +02:00
Petri Lehtinen
7c707a73a2 Only export symbols starting with "json_" in libjansson.la 
This way we don't pollute the symbol namespace with internal symbols.
 2009-11-29 13:04:12 +02:00
Petri Lehtinen
330e892ff6 Make parse_json static 2009-11-29 13:00:47 +02:00
Petri Lehtinen
e0a88d19d1 Merge branch '1.1' 
Conflicts:
	configure.ac
	doc/conf.py
 2009-11-08 22:01:02 +02:00
Petri Lehtinen
842bc2128b jansson 1.1.2 2009-11-08 14:13:32 +02:00
Petri Lehtinen
ca6d26a1c2 Don't include stdint.h in jansson.h 
It's not needed
 2009-11-07 14:45:46 +02:00
Petri Lehtinen
17d913307e Merge branch '1.1' 
Conflicts:
	test/.gitignore
	test/testprogs/Makefile.am
 2009-11-04 22:10:46 +02:00
Petri Lehtinen
f236c14dc5 dump: Revise whitespace usage 
- Never append newline to output
- By default, add spaces between array and object items for more
  readable output
- Introduce the flag JSON_COMPACT to not add the aforementioned spaces
 2009-11-04 22:09:40 +02:00
Petri Lehtinen
d3959a8ce7 load: Parse a badly put - sign correctly 
Thanks to Manolis Delakis for reporting.
 2009-10-29 15:45:16 +02:00
Petri Lehtinen
f243930b68 json_load_file: Initialize the error struct properly 
Failing to do this has the effect that the error message is not
returned when the input file cannot be opened (e.g. if it doesn't
exist).

Thanks to Martin Vopatek for reporting.
 2009-10-27 17:56:02 +02:00
Petri Lehtinen
325101e525 jansson 1.1 2009-10-20 21:29:16 +03:00
raoulh
a83cd30c31 Add C++ guards to jansson.h 
Signed-off-by: Petri Lehtinen <petri@digip.org>
 2009-10-19 12:22:21 +03:00
Petri Lehtinen
86dc1d629b Fix indentation 
No functional changes.
 2009-10-16 21:20:38 +03:00
Petri Lehtinen
4cd777712b Enhance handling of circular references 
It's now an error to try to add an object or array to itself. The
encoder checks for circular references and fails with an error status
if one is detected.
 2009-10-15 21:02:27 +03:00
Petri Lehtinen
79009e62c1 json_dumps: Close the strbuffer if dumping fails 2009-10-15 20:54:32 +03:00
Petri Lehtinen
951d091f07 Make integer, real and string mutable 
Added functions:

  json_string_set
  json_integer_set
  json_real_set

While at it, clarify the documentation and parameter naming of
json_{string,integer,real}_value() a bit.
 2009-10-14 08:23:02 +03:00
Petri Lehtinen
185e107d24 Don't use non-portable asprintf() 
Thanks to Adam Strzelecki for reporting.
 2009-10-13 15:40:26 +03:00
Petri Lehtinen
ca7703fbd1 Merge branch '1.0' 
Conflicts:
	configure.ac
	doc/conf.py
 2009-10-11 21:51:54 +03:00
Petri Lehtinen
12cd4e8c09 jansson 1.0.4 2009-10-11 21:38:42 +03:00
Petri Lehtinen
1e00cd58a5 Extend object API 
Added functions:

  json_object_size
  json_object_clear
  json_object_update
 2009-10-11 20:44:01 +03:00
Petri Lehtinen
9d648a87cb Check json_object_set_new arguments 
A segfault was caused by NULL key.
 2009-10-10 22:53:36 +03:00
Petri Lehtinen
19588c2d69 Fix a few more compilation issues 
These were left out from the previous commit.
 2009-10-06 13:22:27 +03:00
Petri Lehtinen
9c5a8430db Make it compile on platforms where char is unsigned 
Linux on powerpc seems to be one such platform.
 2009-10-01 21:54:45 +03:00
Petri Lehtinen
cbacac5975 Extend array API 
Added functions:

  json_array_insert
  json_array_insert_new
  json_array_remove
  json_array_clear
  json_array_extend
 2009-09-29 22:17:58 +03:00
Petri Lehtinen
7728716759 Merge branch '1.0' 
Conflicts:
	configure.ac
	doc/conf.py
 2009-09-14 15:06:06 +03:00
Petri Lehtinen
b7bf96996f jansson 1.0.3 2009-09-14 14:32:41 +03:00
Petri Lehtinen
6d8c287032 load: Check for integer and real overlfows and underflows 
Backported from master, commit 5406c2b3d3:
  * deleted test/testdata/invalid-stripped because the stripped tests
    don't exist in 1.0
 2009-09-14 10:28:03 +03:00
Petri Lehtinen
5406c2b3d3 load: Check for integer and real overlfows and underflows 2009-09-13 13:18:01 +03:00
Petri Lehtinen
743af38e7f Use unsigned long instead of uint32_t 
Some day we will have ANSI C compatibility... This change doesn't make
the API backwards incompatible because uint32_t was only used in flags
to json_dump*() and the flags are meant to be used only by ORing
constants and macro output, and actually currently only JSON_INDENT
can be used.
 2009-09-13 13:16:34 +03:00
Petri Lehtinen
55d2566539 Merge branch '1.0' into HEAD 
Conflicts:
	configure.ac
	doc/conf.py
 2009-09-08 17:02:39 +03:00
Petri Lehtinen
827a01937f jansson 1.0.2 2009-09-08 16:48:26 +03:00
Petri Lehtinen
0f62dac627 load: Handle EOF correctly 
In stream_get(), EOF never got it to stream->buffer and because of
this, stream_unget() failed on some situations. This patch makes
stream_get() handle EOF just like any other byte.

As a "side effect", lex_scan_string() now needs to unget the EOF, or
otherwise it ends up in error message on premature end of input.
 2009-09-08 16:41:07 +03:00
Petri Lehtinen
7ee974e91c Don't perform reference counting on true, false and null 
This makes their constructors thread safe. A special reference count
-1 is used to test whether to perform reference counting on a value or
not.
 2009-09-07 21:40:14 +03:00
Petri Lehtinen
234ee47281 Better argument validation 
All pointer arguments are now tested for NULL. json_string() now also
tests that strdup() succeeds. This is to ensure that no NULL values
end up in data structures.

Also desribe the different sources of errors in documentation.
 2009-09-06 22:24:55 +03:00
Petri Lehtinen
98a8c1aebf Don't include unistd.h 
It's not needed.
 2009-09-06 22:24:22 +03:00
Petri Lehtinen
fd259ff68c Merge branch '1.0' 
Conflicts:
	configure.ac
	doc/conf.py
 2009-09-06 12:53:38 +03:00
Petri Lehtinen
e4be4a4a28 jansson 1.0.1 2009-09-04 20:58:55 +03:00
Petri Lehtinen
78eda92908 jansson.h: Fix typo 
json_is_true was spelled jsin_is_true. Quite fatal.
 2009-09-04 15:21:00 +03:00
Petri Lehtinen
9611780907 dump: Optimize indenting 
Don't alloca() a whitespace buffer and fill it with spaces in each
call to dump_indent. Instead, use a static whitespace buffer.

As a bonus, this saves the use of poorly portable alloca().
 2009-09-04 09:52:40 +03:00
Petri Lehtinen
93c5892bc3 load: Factor out an unneeded strdup 
By "stealing" the string parsed out in lexer, one strdup can be saved.
 2009-09-04 09:52:40 +03:00
Petri Lehtinen
1095ca956b Don't define -std=c99 in AM_CFLAGS 
It is not needed.
 2009-09-04 09:52:40 +03:00
Petri Lehtinen
89d09813c3 Add reference stealing functions for inserting values to objects and arrays 
The non-stealing functions are now just simple wrappers around these.
 2009-09-04 09:52:37 +03:00
Petri Lehtinen
ee2d164025 Detect garbage near EOF in json_loadf() and json_load_file() 2009-08-24 20:58:59 +03:00
Petri Lehtinen
114fc96f76 array: Fix a few checks and a leak 2009-08-23 13:34:12 +03:00
Petri Lehtinen
0428f48d19 Refuse to dump other types than array and object as the root value 2009-08-04 20:58:02 +03:00
Petri Lehtinen
36530d8c25 Remove unimplemented json_clone() 2009-07-30 11:32:27 +03:00
Petri Lehtinen
08d712d038 Add macro json_is_boolean 2009-07-30 11:32:27 +03:00
Petri Lehtinen
2f4d6f8ae7 Add LICENSE and a copyright note to all sources 2009-07-30 11:32:24 +03:00
Petri Lehtinen
f41e380984 Rename json_{load,dump} to json_{load,dump}_file 2009-07-28 10:58:13 +03:00