FGCOM/jansson
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
600 Commits 1 Branch 31 Tags 2 MiB
78a80b8899
Commit Graph

600 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Phillip Howell
0747d3943f Clarified json_load_callback_t return value docs 2013-09-16 08:49:38 +03:00
Petri Lehtinen
5f9ef108d0 Merge pull request #134 from lano1106/master 
Replace strcpy with memcpy
 2013-08-27 22:37:44 -07:00
Olivier Langlois
21599b95f8 Replace strcpy with memcpy 
Since len is known, the copy function does not need to check byte by byte
the end of the string.

Signed-off-by: Olivier Langlois <olivier@olivierlanglois.net>
 2013-08-27 22:47:18 -04:00
Petri Lehtinen
3196ad48ed pack: Add format specifiers s#, + and +# 2013-08-14 21:54:11 +03:00
Petri Lehtinen
49ad5328c7 doc: Add an example for circumventing problems with Windows heaps 2013-08-06 08:12:20 +03:00
Petri Lehtinen
71676acd0b Fix memory leaks and warnings in github_commits.c 2013-07-27 21:23:34 +03:00
Petri Lehtinen
2489ea90b1 Update copyrights for 2013 2013-07-23 13:20:06 +03:00
Petri Lehtinen
11d45b0090 Fix integer overflow in jsonp_strdup() 
Fixes #129.
 2013-07-21 13:00:32 +03:00
Petri Lehtinen
8490e377c0 Make the argument of json_deep_copy() const 
Fixes #126.
 2013-07-08 12:36:56 +03:00
Petri Lehtinen
ef666519f7 Merge pull request #128 from JoakimSoderberg/lex_unget_unsave_fix 
BUGFIX: Compilation error with -DNDEBUG defined.
 2013-07-01 21:41:55 -07:00
Joakim Soderberg
6fe231757e BUGFIX: Compilation error with -DNDEBUG defined. 
When building a "MinSizeRel" with CMake I get a compilation error in lex_unget_unsave. This is because assertions are turned off using -DNDEBUG:

```
/usr/bin/gcc  -DHAVE_CONFIG_H -fPIC -Os -DNDEBUG -Ijansson/build/include -Ijansson/build/private_include    -Wall -Wextra -Wdeclaration-after-statement -Werror -o CMakeFiles/jansson.dir/src/load.c.o   -c jansson/src/load.c
jansson/src/load.c: In function âx_unget_unsaveâjansson/src/load.c:256:14: error: variable â set but not used [-Werror=unused-but-set-variable]
cc1: all warnings being treated as errors
```

This will then remove the insert, which makes the "d" variable unused, which is treated as an error since we have -Wall set. We can't simply get rid of the variable either and put the strbuffer_pop call in the assert call, since it's a macro and would remove the call entirely. So I simply added a check for NDEBUG to fix it.
 2013-06-26 09:50:46 +00:00
Petri Lehtinen
84b5bfe173 Merge pull request #127 from cryptobiote/master 
Adding option for MSVC for those who are linking statically.
 2013-06-25 11:30:39 -07:00
cryptobiote
d9ee5a7f1b Update CMakeLists.txt 2013-06-25 09:36:11 -06:00
cryptobiote
19a19d1952 Adding option for MSVC for those who are linking statically. 2013-06-20 11:00:40 -06:00
Petri Lehtinen
68e201add8 Merge pull request #125 from jjwchoy/master 
Prevent compiler warning
 2013-06-13 22:59:22 -07:00
Jason Choy
62531bd012 Prevent unused-variable warning 2013-06-13 11:37:07 +01:00
Petri Lehtinen
f639fbd2c3 Tweak the JSON_DECODE_INT_AS_REAL test introduced in #123 
Only run the imprecision part if json_int_t is long long, otherwise
the imprecision cannot be tested against json_int_t.

Also, convert the double value to json_int_t before checking the
imprecision, because otherwise the json_int_t is converted to double
and the imprecision happens in the "wrong direction".
 2013-06-12 08:36:53 +03:00
Petri Lehtinen
a38704df58 Fix indentation in docs 2013-06-12 08:30:28 +03:00
Petri Lehtinen
8d439710cd Merge pull request #123 from jjwchoy/decode-ignore-int 
Implemented a decode option to only decode numbers to reals
 2013-06-11 22:23:40 -07:00
Jason Choy
120a90a155 Using jsonp_strtod instead of casting to double to catch double overflow 2013-06-11 15:09:08 +01:00
Jason Choy
c3e9725f02 Changed :versionadded for JSON_DECODE_INT_AS_REAL docs 2013-06-11 12:31:41 +01:00
Jason Choy
02a3829363 Renamed flag to JSON_DECODE_INT_AS_REAL and added documentation 2013-06-11 12:24:28 +01:00
Petri Lehtinen
018f7fea31 Merge pull request #120 from paulharris/mine_pre_2.5 
Adjust CMakeLists.txt and .def: add _d postfix onto jansson_d.lib/dll
 2013-06-09 22:18:05 -07:00
Jason Choy
e6bd0aba9d Added a simple test for the JSON_DECODE_NO_INT option 2013-06-09 15:34:30 +01:00
Jason Choy
9e7f11a847 Implemented a decode option to only decode numbers to reals and never integers 2013-06-09 15:14:47 +01:00
Petri Lehtinen
042d4b2a6b Merge pull request #121 from jjwchoy/master 
Added missing return valua check in test
 2013-06-07 05:17:46 -07:00
Jason Choy
ddd10b5e0b Added missing rv check - caught by clang 2013-06-07 13:08:22 +01:00
Paul Harris
2fd66fab1a Adjust CMakeLists.txt and .def: add _d postfix onto jansson_d.lib/dll 
Had to remove the "LIBRARY" line from jansson.def, which was optional,
and was overriding CMake's desire for a specific name.
 2013-06-02 22:00:32 +08:00
Petri Lehtinen
5cc594c9e8 Don't shadow the stdlib function index() with arg names 
Fixes #119.
 2013-05-21 08:54:27 +03:00
Petri Lehtinen
ffb7ef4b75 Merge pull request #118 from dtgriscom/master 
Added json_array_foreach(), parallelling json_object_foreach()
 2013-05-12 22:16:09 -07:00
Daniel Griscom
b49280be72 Fixed "comparison between signed and unsigned" warning 2013-05-12 15:45:33 -04:00