Joakim Soderberg
4c2cc0e36c
Add CMake build to Travis config.
2014-01-28 14:06:43 +01:00
Petri Lehtinen
a630e226ba
Merge pull request #159 from JoakimSoderberg/config_fix
...
Make sure the private config is included.
2014-01-28 01:11:57 -08:00
Joakim Soderberg
0c95a22888
Make sure the private config is included.
2014-01-28 09:59:43 +01:00
Petri Lehtinen
30fdf6067e
Update copyrights for 2014
2014-01-28 09:16:05 +02:00
Petri Lehtinen
cffc5df600
Merge pull request #157 from JoakimSoderberg/cmake_config_new
...
Cmake config
2014-01-27 23:10:55 -08:00
Joakim Soderberg
3fe8f74e7f
Renamed config.h -> jansson_private_config.h
...
This is because it's really easy to get a name collission if compiling
Jansson as a subproject in a larger CMake project. If one project includes
several subprojects each having their own config.h, this will cause the
wrong file to be loaded.
2014-01-27 12:48:52 +01:00
Joakim Soderberg
913937c98d
Added CMake config files.
...
This will simplify linking against the lib, both from the build-tree and
install-tree from other CMake projects.
CMakes find_package command uses these configs to locate the exported
targets for the library.
* Also changed so that all CMake options for the project are prepended
with JANSSON_ so that there is no ambiguity when including this as a
subdirectory in another CMake project.
2014-01-24 14:13:02 +01:00
Petri Lehtinen
b21cd65d30
Fix CMake build flags for MinGW
2014-01-16 08:03:05 +02:00
Petri Lehtinen
c89638d73c
Merge pull request #151 from nmlgc/master
...
Check for key == NULL in json_object_get and json_object_del
2013-12-28 02:56:35 -08:00
nmlgc
98610bfcec
Check for key == NULL in json_object_get and json_object_del
2013-12-28 06:11:49 +01:00
Petri Lehtinen
9c8b3c833f
Merge branch '2.5'
2013-12-27 08:55:52 +02:00
Petri Lehtinen
dc69aa797b
github_commits.c: GitHub API v3 requires a User-Agent header
2013-12-27 08:55:05 +02:00
Petri Lehtinen
4e8c4bfbd2
Merge branch '2.5'
2013-12-13 09:27:42 +02:00
Petri Lehtinen
316492e4d0
Merge
2013-12-13 09:26:58 +02:00
Petri Lehtinen
3347679d8f
Merge branch '2.5'
2013-12-13 09:22:50 +02:00
Petri Lehtinen
b951baec0d
Include CMake specific files in release tarballs
...
Fixes #147 .
2013-12-13 09:22:36 +02:00
Petri Lehtinen
05f7d30e5a
Add json_boolean_value as alias for json_is_true
...
Fixes #146 .
2013-12-04 09:14:19 +02:00
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
30a4c88843
Fix an off-by-one error
2013-10-15 08:49:40 +03:00
Petri Lehtinen
08be94e8e6
Don't call strlen twice
...
Oops.
2013-10-15 08:46:17 +03:00
Petri Lehtinen
d544852ff6
Avoid integer overflows with very long strings
2013-10-15 08:44:04 +03:00
Petri Lehtinen
8dc3233f3b
Merge pull request #143 from chipdude/master
...
paper bag bug: json_string_set* functions should set the length too
2013-10-03 22:36:34 -07:00
Chip Salzenberg
c7d479c740
in simple string tests, always check lengths too
2013-10-03 19:07:50 -07:00
Chip Salzenberg
a76dc45512
paper bag bug: json_string_set* functions should set the length too
2013-10-03 19:07:20 -07:00
Petri Lehtinen
9bb5a266dd
Merge pull request #142 from chipdude/master
...
fix type mismatch anywhere int != int32 (Vorne)
2013-09-30 22:41:25 -07:00
Chip Salzenberg
6ebd0bc7a6
fix type mismatch anywhere int != int32 (Vorne)
2013-09-30 16:56:01 -07:00
Petri Lehtinen
f8d8d524cf
Document JSON_ALLOW_NUL and clarify NUL byte handling
2013-09-30 10:55:34 +03:00
Petri Lehtinen
1bfc33362e
Add JSON_ALLOW_NUL decoding flag for enabling NUL byte support
2013-09-30 10:45:02 +03:00
Petri Lehtinen
5744468c99
Clarify json_string_length doc
2013-09-30 10:45:02 +03:00
Petri Lehtinen
4d5aead31c
Fix NUL byte check for object keys
2013-09-30 10:45:02 +03:00
Petri Lehtinen
78a80b8899
load.c: Change an error message
2013-09-30 09:24:36 +03:00
Petri Lehtinen
b961e8101e
Add Chip's changes to release notes
2013-09-30 08:56:39 +03:00
Petri Lehtinen
7876125a22
Document s% and s# for json_pack, s% for json_unpack
2013-09-30 08:47:05 +03:00
Petri Lehtinen
e2dcf94598
Merge pull request #141 from chipdude/nuls
...
add new public functions to jansson.def
2013-09-29 22:31:15 -07:00
Chip Salzenberg
6c1ce27095
add new public functions to jansson.def
2013-09-29 16:57:23 -07:00
Petri Lehtinen
46e27ae6d5
Merge pull request #140 from chipdude/nuls
...
Support "\u0000" in strings
2013-09-29 11:57:57 -07:00
Chip Salzenberg
0be5c959da
document new null-friendly functions
2013-09-27 19:10:32 -07:00
Chip Salzenberg
face43929d
expect "export" in test configs
2013-09-27 17:32:25 -07:00
Chip Salzenberg
dcaa90d21e
dump \u sequences as upper case for readability (just like error messages)
2013-09-27 17:32:25 -07:00
Chip Salzenberg
9c259c07aa
Support \u0000 - add size_t string lengths to API, load and dump \u000, etc.
...
Also:
Steal strings during parsing for half the mallocs!
Change all input-caused assertions to errors. No crashes please, we're programmers.
2013-09-27 17:32:06 -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
e39112b29c
Merge branch '2.4'
2013-09-19 20:47:33 +03:00
Petri Lehtinen
bf2584703a
Mention success first in json_load_callback_t docs
2013-09-19 20:47:17 +03:00
Phillip Howell
db8ca3645f
Clarified json_load_callback_t return value docs
2013-09-19 20:47:02 +03:00
Petri Lehtinen
0490907fb3
Merge branch '2.4'
2013-09-19 20:46:07 +03:00
Petri Lehtinen
c2e8fdde9d
Mention success first in json_load_callback_t docs
2013-09-19 20:45:51 +03:00
Petri Lehtinen
24c67966aa
Mention success first in json_load_callback_t docs
2013-09-16 08:49:38 +03:00
