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

824 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Daniel Griscom
7121134abd Removed (non-functioning) printfs from test code 2013-05-12 15:36:09 -04:00
Daniel Griscom
e8c812b500 Added test cases and documentation for json_array_foreach() 2013-05-12 15:34:26 -04:00
Daniel Griscom
6950cd203b Add json_array_foreach() #define, parallelling json_object_foreach() 2013-05-12 15:03:26 -04:00
Petri Lehtinen
d3bd463897 Merge pull request #115 from JoakimSoderberg/cmake_pkgconfig 
Cmake pkgconfig
 2013-05-06 22:38:28 -07:00
Joakim Soderberg
54d86fb4a4 Create and install the pkg-config file jansson.pc for CMake. 
Use the same jansson.pc.in file as the ./configure script does to generate the jansson.pc file for pkg-config. Also make an install rule for this.
 2013-05-06 12:34:52 +00:00
Joakim Soderberg
42d398243d Fix the cmake Sphinx find script. 
The cmake sphinx find script version parsing assumes a format of 1.2.3, but sphinx version can be 1.2b3 as well, so parse those correctly as well.
 2013-05-06 12:31:29 +00:00
Andrei Epure
f675514815 jansson:doc: modified incref doc 
Signed-off-by: Andrei Epure <epure.andrei@gmail.com>
 2013-04-29 15:32:52 +03:00
Andrei Epure
5793142861 test:suites:api: modified error message 
In the "/* perform the same update again */" area the error
message should be "unable to update an non-empty object"
instead of "unable to update an empty object".

Signed-off-by: Andrei Epure <epure.andrei@gmail.com>
 2013-04-29 15:32:52 +03:00
Petri Lehtinen
b227f96c45 Merge pull request #112 from JoakimSoderberg/fpic_cmake_support 
Additional CMake documentation + Fpic cmake support
 2013-04-29 03:56:23 -07:00
Joakim Soderberg
0687442f5d Fixed some minor issues. 2013-04-25 13:59:26 +00:00
Joakim Soderberg
8390c90a91 Added more detailed CMake documentation. 
- Also added better FindSphinx support so that we can detect the version and not  have a fatal error if it's too old.
- Added support for building latex documentation with -DBUILD_LATEX. Off by default.
- Added suppor for building man pages with -DBUILD_MAN. On by default (unless sphins is too old to support it).
 2013-04-24 14:14:00 +00:00
Joakim Soderberg
3000831365 Use -fPIC when possible. 
So that we can link the library statically to shared libraries.
 2013-04-18 09:25:17 +00:00
Petri Lehtinen
6b1cba94e3 Document CMake build process, deprecate the VS2010 project 2013-04-15 10:31:23 +03:00
Petri Lehtinen
9591d3a155 Tweak Android build documentation 2013-04-15 10:25:32 +03:00
Petri Lehtinen
83d04ddd68 Merge branch 'master' of git://github.com/svic/jansson 2013-04-15 10:21:31 +03:00
Petri Lehtinen
70232676f7 Merge branch '2.4' 2013-04-15 09:15:35 +03:00
Petri Lehtinen
257a716073 Fix the signature again, and also rest of the errors 
Next time, remember to check with -Werror first...
 2013-04-15 09:15:03 +03:00
Petri Lehtinen
0ccd2c7715 Merge branch '2.4' 2013-04-15 09:09:01 +03:00
Petri Lehtinen
42e307b3c5 Fix the signature of a test function 2013-04-15 09:08:47 +03:00
Petri Lehtinen
61cba2ae50 Merge branch '2.4' 2013-04-15 08:49:47 +03:00
Petri Lehtinen
867079c820 json_dump*(): Don't crash if json is NULL and JSON_ENCODE_ANY is set 2013-04-15 08:49:09 +03:00
Garner Lee
d20751d53d Add android doc. 2013-04-11 13:32:04 -07:00
Petri Lehtinen
6281d1c549 Merge pull request #108 from Zillode/1edff47af38a2335f88300ee6dc437118f5a20ff 
Fixes redefined warnings ("_GNU_SOURCE")
 2013-04-02 05:40:49 -07:00
Petri Lehtinen
8fd475bf96 Merge branch '2.4' 2013-04-01 14:41:14 +03:00
Petri Lehtinen
bbd3b0ca4f Fix a typo 2013-04-01 14:41:10 +03:00
Garner Lee
7c4f323abc Create Android.mk, preconfigured jansson_config.h and CleanSpec.mk for Android-like build systems. 2013-03-27 17:31:05 -07:00