Virtualization
/
jansson
mirror of https://github.com/akheron/jansson
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
747 Commits 29 Branches 31 Tags 3 MiB
Commit Graph

747 Commits

Author SHA1 Message Date
Michael Chen c833e08ec0 Merge remote-tracking branch 'origin/akamai_dev_branch' 2015-07-06 15:45:31 -04:00
Michael Chen e70b9712c7 fixed typos and ready for pull request 
fixed typos
 2015-07-06 15:45:00 -04:00
Michael Chen ec1d8280ec Merge branch 'refs/heads/akamai_dev_branch' 2015-07-06 15:35:52 -04:00
Michael Chen 1ba9d329d2 made flag field plural because it is a bitfield 
made flag field plural because it is a bitfield
 2015-07-06 15:29:13 -04:00
Michael Chen 0e115ea1a2 Revert "Revert "Revert "Added is_modified feature to json_t struct""" 
This reverts commit c34cbc5a67.
 2015-07-06 15:21:38 -04:00
Michael Chen 2b092a017e Changed to unsigned char to avoid library issues 
Changed to unsigned char to avoid library issues
 2015-07-06 15:21:04 -04:00
Michael Chen 580281edcd added return value for success 
added return value for success
 2015-07-06 13:53:01 -04:00
Michael Chen 982c2664a8 fixed to uint32 param 
fixed to uint32 param
 2015-07-06 13:50:25 -04:00
Michael Chen c34cbc5a67 Revert "Revert "Added is_modified feature to json_t struct"" 
This reverts commit a54b12a45d.
 2015-07-06 13:48:09 -04:00
Michael Chen 9f04578948 Added getter and changed to unsigned 32 int 
Added getter and changed to unsigned 32 int
 2015-07-06 13:47:53 -04:00
Michael Chen a54b12a45d Revert "Added is_modified feature to json_t struct" 
This reverts commit 4d9524e54c.
 2015-07-06 13:41:34 -04:00
Michael Chen 31a17a614e Changed bool 'is_modified' field to int 'flag' field 
Changed bool 'is_modified' field to int 'flag' field
 2015-07-06 11:57:55 -04:00
Michael Chen 4d9524e54c Added is_modified feature to json_t struct 
Added is_modified field to json_t struct along with getter and setter
methods.
 2015-07-06 11:40:13 -04:00
Michael Chen 7e60fbe049 Added is_modified feature to json_t struct 
Added is_modified field to json_t struct along with getter and setter
methods.
 2015-07-06 11:38:03 -04:00
Petri Lehtinen fef27e6d3e Merge branch '2.7' 2015-05-19 08:54:13 +03:00
Petri Lehtinen 1dab656dee doc: Copying doesn't preserve key insertion order 
Fixes #237.
 2015-05-19 08:54:09 +03:00
Petri Lehtinen 69678aaa35 doc: Copying doesn't preserve key insertion order 
Fixes #237.
 2015-05-19 08:49:10 +03:00
Petri Lehtinen d384acd706 Merge pull request #234 from flok99/master 
Optimized dump_indent to reduce the number of fwrite calls.
 2015-05-04 09:00:26 +03:00
Folkert van Heusden 5d42e1520a Optimized dump_indent to reduce the number of fwrite calls. 2015-05-01 15:18:53 +02:00
Petri Lehtinen d8753db4ac Merge pull request #233 from haldean/master 
Use snprintf and strncpy in place of sprintf and strcpy

OpenBSD linker nags about using sprintf and strcpy.
 2015-04-30 10:43:39 +03:00
Haldean 95dd927857 use snprintf and strncpy in place of sprintf and strcpy 
This is both good practice and nice for OpenBSD users, who will no
longer get the nag message to not use sprintf/strcpy every time they
link against jansson. It's worth noting that the existing code seems
safe to me - bounds checks were already happening before the actual
calls - and that this is for extra security.
 2015-04-30 00:11:25 -07:00
Petri Lehtinen 76760011ff Don't crash when building documentation man pages 
Fixes #207.
 2015-03-07 09:14:06 +02:00
Petri Lehtinen 11813f4128 Fix a use after free 2015-02-07 07:36:29 +02:00
Petri Lehtinen 8b1bdcacb7 Merge pull request #221 from lioncash/test 
test_object: Fix a duplicate conditional check in test_iterators
 2015-02-05 09:28:43 +02:00
Lioncash c242b46016 test_object: Fix a duplicate conditional check in test_iterators 2015-02-05 01:26:13 -05:00
Petri Lehtinen 58c188e1d5 Merge pull request #217 from JoakimSoderberg/simple_parse_cmake 
Compile simple_parse example for CMake project.
 2015-01-14 08:05:51 +02:00
Petri Lehtinen ffc18128f4 Merge pull request #216 from JoakimSoderberg/infinity_warning 
Disable warning for deliberate use on MSVS.
 2015-01-14 08:04:37 +02:00
Joakim Soderberg 6a38d0d431 Disable warning for deliberate use on MSVS. 
Disable "warning C4756: overflow in constant arithmetic" when deliberately
triggering it in a test using infinity.
 2015-01-13 16:30:00 +01:00
Joakim Soderberg d0a8ad4c06 Compile simple_parse example for CMake project. 2015-01-13 16:17:48 +01:00
Petri Lehtinen c244b1483e examples/README.rst: Fix formatting 2014-12-30 08:56:07 +02:00
Petri Lehtinen fc83f10c85 Add Makefile.am for examples 2014-12-30 08:50:33 +02:00
Petri Lehtinen 8d561cd94e examples/simple_parse.c: Reindent, fix warnings & style 2014-12-30 08:50:33 +02:00
Petri Lehtinen 970c6988a5 Merge pull request #214 from rdpoor/master 
adding simple-parse example
 2014-12-30 08:33:34 +02:00
Robert Poor 220dcb7be3 use fgets() rather than getline() 2014-12-29 06:22:19 -08:00
Robert Poor 48e0488f07 adding simple-parse example 2014-12-26 10:49:15 -08:00
Petri Lehtinen 890760b2fb Increase test coverage 2014-12-19 08:35:46 +02:00
Petri Lehtinen 15653c47dd Add a test case for \u0000 2014-12-19 07:57:33 +02:00
Petri Lehtinen 5508ab403d Honor JSON_DECODE_INT_AS_REAL at lexical stage 
This has the consequence that numbers are never converted to integers
when JSON_DECODE_INT_AS_REAL is set, and thus it works correctly all
integers that are representable as double.

Fixes #212.
 2014-12-18 15:16:14 +02:00
Petri Lehtinen d799ee11b4 doc: Update the Getting Started chapter 
- It's not true anymore that there are no configure options that modify
  Jansson's behaviour

- Remove trailing whitespace
 2014-12-18 14:47:08 +02:00
Petri Lehtinen abaae7630e Make it possible to set initial hashtable size 
Fixes #213.
 2014-12-18 14:43:44 +02:00
Petri Lehtinen 5c1d87592a wip: add tests 2014-12-15 08:30:59 +02:00
Petri Lehtinen 5885035f5f Add coveralls.io badge to README.rst 2014-12-15 08:14:57 +02:00
Petri Lehtinen dee4a7c29e Merge pull request #211 from JoakimSoderberg/coveralls 
Add support for coverage/coveralls.io in cmake project.
 2014-12-15 08:09:13 +02:00
david bigagli 82a55ef205 doc patch for jansson 2014-12-15 07:47:19 +02:00
Joakim Söderberg 19f33c0e71 Add support for coverage/coveralls.io in cmake project. 
This adds support for http://coveralls.io/ to the cmake project. This can then be run via a new Travis job, which uploads json containing the coverage data to the website.

To use this, please login usin github at http://coveralls.io/ and enable the Jansson project. You can then get a nice percentage badge for code coverage after each Travis buid. Coveralls will also comment on pull request with coverage info.

To test and run it locally do:

```bash
$ mkdir build && cd build
$ cmake -DJANSSON_COVERALLS=ON -DCMAKE_BUILD_TYPE=Debug ..
$ cmake --build .                      # $ make
$ cmake --build . --target coveralls   # $ make coveralls
```

There is also another script that generates a local HTML page using lcov CodeCoverage.cmake which can be run using

```bash
$ make coverage
```

The required depdencies to run this are:
gcov
curl
lcov (is needed for the normal CodeCoverage script)
 2014-12-12 23:57:01 +01:00
Petri Lehtinen 3c9e5c9925 Move the list member to the top of hashtable_pair struct 
This may make debugging easier with limited debuggers.
 2014-12-10 07:41:41 +02:00
Petri Lehtinen 1c38ab17f5 Include jansson_config.h with quotes 
Fixes #209.
 2014-12-04 10:45:26 +02:00
Petri Lehtinen d5edfcc6fd Merge pull request #208 from skeid21/master 
Fix warnings on LLVM 6.0 targetion iOS arm64.
 2014-11-29 11:52:11 +02:00
Shawn Harris 9b435df3d4 Warnings - use size_t where appropriate to prevent warning when compilation is targeting 64 bit 2014-11-28 18:11:26 -07:00
Petri Lehtinen bc743ad2d9 README: Documentation is hosted at RTD 2014-10-20 20:27:56 +03:00