mirror/json-c
1
0
Fork 0
mirror of https://github.com/json-c/json-c.git synced 2026-03-22 06:29:06 +08:00
Code Issues Packages Projects Releases Wiki Activity
817 Commits 14 Branches 11 Tags
baed9983b30b46cf6685a061632bbc42cec0ce8d
Commit Graph

817 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Haszlakiewicz
baed9983b3 Add a json_object_from_fd_ex() function, to allow the max nesting depth to be specified. 2019-11-10 00:14:44 -05:00
Eric Haszlakiewicz
ac26ea9c5b Add a test for serializing the double value -1.0. 2019-11-10 00:13:00 -05:00
Eric Haszlakiewicz
ddd049045d Merge pull request #505 from grdowns/vcpkg-instructions 
Add vcpkg installation instructions
 2019-09-26 22:23:52 -04:00
grdowns
7ef51239a9 Update dependencies 2019-09-26 17:11:49 -07:00
grdowns
760c1e284c Add vcpkg installation instructions 2019-09-26 17:09:39 -07:00
Eric Haszlakiewicz
eae040a84a Issue #488: use JSON_EXPORT on functions so they are properly exported on Windows. 2019-09-08 22:42:36 -04:00
Eric Haszlakiewicz
374ffe87c6 Issue #463: fix newlocale() call to use LC_NUMERIC_MASK instead of LC_NUMERIC, and remove incorrect comment. 
The second call to newlocale() with LC_TIME accidentally made things
 work because LC_TIME == LC_NUMERIC_MASK on some platforms.
 2019-09-08 22:27:30 -04:00
Eric Haszlakiewicz
05b41b159e Add a json_tokener_get_parse_end() function to replace direct access of tok->char_offset. 2019-09-08 21:35:37 -04:00
Eric Haszlakiewicz
087534c030 Minor cleanup of includes in a couple of tests. 2019-09-08 21:34:13 -04:00
Eric Haszlakiewicz
d0b87ee87b Add an explicit cast to double to squash a -Wimplicit-int-float-conversion warning. 
Though we will no longer be comparing exactly against INT64_MAX, this is ok
because any value of that magnitude stored in a double will *also* have been
rounded up, so the comparison will work appropriately.
 2019-08-12 00:30:45 +00:00
Eric Haszlakiewicz
a91aa5e35d Merge pull request #499 from andy5995/travis_valgrind 
.travis.yml:test on more recent clang and gcc versions
 2019-07-27 09:29:57 -04:00
andy5995
509600a7f7 add xenial default clang with CHECK enabled 2019-07-26 23:51:18 -05:00
andy5995
4f69529a04 add missing dist 2019-07-26 23:36:01 -05:00
andy5995
dd08b70e46 manually use apt-get to install packages on bionic 2019-07-26 23:21:20 -05:00
andy5995
dd0eef6aab add tests on bionic beaver 2019-07-26 22:42:53 -05:00
andy5995
163db3f6d0 revert toolchain back to "test" 2019-07-26 22:24:12 -05:00
andy5995
1da4b23235 change key 2019-07-26 22:24:12 -05:00
andy5995
a49f1dee8a use "non-test" ppa 
Maybe something weird about how gcc is configured with the test
toolchain?
 2019-07-26 22:24:12 -05:00
andy5995
897b49f475 remove useless condition that shows logs 2019-07-26 22:24:12 -05:00
andy5995
b140c473d1 install doxygen so 'make distcheck' can succeed 2019-07-26 22:24:12 -05:00
andy5995
6288be340c test for more compilers 2019-07-26 22:24:12 -05:00
andy5995
57e79e1d0b show the logs if tests fail 2019-07-26 22:24:12 -05:00
andy5995
50e7fff0f3 .travis.yml:install valgrind 
(#498)
 2019-07-26 22:24:12 -05:00
Eric Haszlakiewicz
c8e1b59ae5 Merge pull request #495 from andy5995/README_typos 
README.md:fix 2 typos
 2019-07-26 23:08:11 -04:00
andy5995
1c7e891e44 "make its use in" [skip ci] 2019-07-26 12:59:24 -05:00
Eric Haszlakiewicz
4a94ddbd8b Merge pull request #500 from andy5995/add_missing_test_deps 
test/Makefile.am:add missing deps for test1 and test2
 2019-07-26 09:48:34 -04:00
andy5995
e2f46b9f79 partial revert (make use) [skip ci] 2019-07-25 22:55:07 -05:00
Eric Haszlakiewicz
68abf12afa Issue #498: Fix a memory leak bug introduced in test_double_serializer in 485f2a02 by adding a json_object_put call. 2019-07-26 03:35:38 +00:00
Eric Haszlakiewicz
48984dbd42 Merge pull request #496 from andy5995/pointer_doc 
json_pointer.h:suggest minor grammar improvement for pointer doc
 2019-07-25 22:58:22 -04:00
andy5995
8ab8df1170 test/Makefile.am:add missing deps for test1 and test2 
Allows the tests to pass when running `make distcheck`

This fixes the 2 broken tests I mentioned at
https://github.com/json-c/json-c/pull/499#discussion_r306998261
 2019-07-25 14:59:56 -05:00
andy5995
a9c34d5531 json_pointer.h:suggest minor grammar improvement for pointer doc 2019-07-23 23:53:06 -05:00
andy5995
3969487376 README.md:fix 2 typos 2019-07-23 23:43:59 -05:00
Eric Haszlakiewicz
07ea04e651 Merge pull request #491 from ploxiln/disable_werror 
build: add option --disable-werror to configure
 2019-06-09 14:05:46 -04:00
Pierce Lopez
634900d270 tests: appease -Wwrite-strings 2019-06-09 12:17:06 -04:00
Pierce Lopez
44605744dc build: fix compiler option -Wwrite-strings 
was typod as -Wwrite-string
 2019-06-09 10:55:50 -04:00
Pierce Lopez
21c886534f build: add --disable-werror option to configure 
to omit -Werror compiler option
 2019-06-09 10:53:56 -04:00
Eric Haszlakiewicz
2b1903cc69 Merge pull request #485 from myd7349/fix-cmake-module 
Install CMake module files
 2019-05-30 22:38:29 -04:00
Eric Haszlakiewicz
485f2a02c7 Issue #486: append a missing ".0" to negative double values too. 2019-05-28 02:44:22 +00:00
myd7349
c2036ab9fc Install CMake module files 2019-05-18 19:44:29 +08:00
Eric Haszlakiewicz
3e81b4abe3 Merge pull request #474 from Jehan/fix-pc-file-cmake 
Installation directories empty with CMake in pkg-config.
 2019-01-26 10:55:50 -05:00
Jehan
c46a0636c6 Installation directories empty with CMake in pkg-config. 
CMake was not properly substituting the installation dir variables (they
ended up all empty), so the pkg-config results were also wrongs. For
instance cflags was: -I -I/json-c
Even though json-c was found at configure time, this obviously broke the
build of any application using it.
 2019-01-26 12:30:40 +01:00
Eric Haszlakiewicz
f1713b3f62 Merge pull request #473 from besser82/fixup/docs_utf8 
Convert ChangeLog to valid UTF-8 encoding.
 2019-01-23 22:47:27 -05:00
Björn Esser
259d5078c4 Clean trailing white-spaces in ChangeLog. 2019-01-22 17:07:14 +01:00
Björn Esser
6b0745ea1f Convert ChangeLog to valid UTF-8 encoding. 2019-01-22 17:07:14 +01:00
Eric Haszlakiewicz
39c9fa0a2b Merge pull request #468 from rkalidas/compiler-fixes 
Fix compiler warnings
 2018-12-19 11:09:01 -05:00
Rubasri Kalidas
3003161eff Fix compiler warnings 2018-12-18 11:30:57 -06:00
Eric Haszlakiewicz
6460446aa6 Switch to building a dynamic lib by default. Tweak language in the README.md slightly. Inspired by PR#452. 2018-12-11 20:59:08 -05:00
Eric Haszlakiewicz
ee4691c9fb Merge pull request #453 from darjankrijan/master 
Fixed misalignment in JSON string due to space after \n being printed...
 2018-12-11 20:17:43 -05:00
Darjan Krijan
9c4b07faec Removed newly created test case and incorporated it into test1.test and test2.test 2018-12-07 17:39:59 +01:00
Darjan Krijan
7a9075c16b Added test cases for spaced pretty and pretty_tab used together 2018-12-07 17:30:15 +01:00