]>
granicus.if.org Git - json-c/log
dota17 [Thu, 27 Feb 2020 07:01:06 +0000 (15:01 +0800)]
modify partial functions and testcase, in order to support automatic conversion for int64/uint64
dota17 [Wed, 26 Feb 2020 12:54:36 +0000 (20:54 +0800)]
modify the json_object, replace c_int64/c_uint64 with struct{union{int64, uint64},...}
dota17 [Thu, 20 Feb 2020 07:17:05 +0000 (15:17 +0800)]
add uint64 data to json-c
Eric Haszlakiewicz [Fri, 14 Feb 2020 03:48:02 +0000 (03:48 +0000)]
Issue #539: use a internal-only serializer function in json_object_new_double_s() to avoid potential conflicts with user code that uses the json_object_userdata_to_json_string serializer. Also, document the serializer-resetting behavior of json_object_set_double().
Eric Haszlakiewicz [Fri, 14 Feb 2020 03:25:46 +0000 (03:25 +0000)]
Issue #539: be sure to clean up at the end of test_set_value.
Eric Haszlakiewicz [Thu, 13 Feb 2020 03:11:10 +0000 (03:11 +0000)]
Issue #539: reset the serializer when json_object_set_double() is called and the current serializer is the one that json_object_new_double_s() used.
Eric Haszlakiewicz [Thu, 6 Feb 2020 02:56:06 +0000 (21:56 -0500)]
Merge pull request #531 from dota17/utf8test
validate utf-8 string
Eric Haszlakiewicz [Wed, 22 Jan 2020 04:23:53 +0000 (23:23 -0500)]
Merge pull request #536 from dota17/new_null
add json_object_new_null()
dota17 [Wed, 22 Jan 2020 01:56:52 +0000 (09:56 +0800)]
update comment
dota17 [Mon, 20 Jan 2020 07:00:11 +0000 (15:00 +0800)]
add json_object_new_null
dota17 [Fri, 17 Jan 2020 07:33:44 +0000 (15:33 +0800)]
update code
Eric Haszlakiewicz [Mon, 13 Jan 2020 03:42:02 +0000 (22:42 -0500)]
Merge pull request #533 from sunpoet/master
Fix "make check"
Po-Chuan Hsieh [Sat, 11 Jan 2020 07:20:44 +0000 (07:20 +0000)]
Fix make check
cc -DHAVE_CONFIG_H -I. -I.. -I.. -I../tests -O2 -pipe -fstack-protector-strong -fno-strict-aliasing -Wall -Werror -Wcast-qual -Wno-error=deprecated-declarations -Wextra -Wno-unused-parameter -D_GNU_SOURCE -D_REENTRANT -MT test_parse.o -MD -MP -MF .deps/test_parse.Tpo -c -o test_parse.o test_parse.c
test_parse.c:256:14: error: adding 'int' to a string does not append to the string [-Werror,-Wstring-plus-int]
{ "null123" + 4, 4, 3, json_tokener_success, 1 },
~~~~~~~~~~^~~
test_parse.c:256:14: note: use array indexing to silence this warning
{ "null123" + 4, 4, 3, json_tokener_success, 1 },
^
& [ ]
test_parse.c:258:12: error: adding 'int' to a string does not append to the string [-Werror,-Wstring-plus-int]
{ "nullx" + 4, 2, 0, json_tokener_error_parse_unexpected, 1 },
~~~~~~~~^~~
test_parse.c:258:12: note: use array indexing to silence this warning
{ "nullx" + 4, 2, 0, json_tokener_error_parse_unexpected, 1 },
^
& [ ]
test_parse.c:260:25: error: adding 'int' to a string does not append to the string [-Werror,-Wstring-plus-int]
{ "{\"a\":1}{\"b\":2}" + 7,
~~~~~~~~~~~~~~~~~~~~~^~~
test_parse.c:260:25: note: use array indexing to silence this warning
{ "{\"a\":1}{\"b\":2}" + 7,
^
& [ ]
3 errors generated.
*** Error code 1
Stop.
dota17 [Wed, 8 Jan 2020 11:42:05 +0000 (19:42 +0800)]
test utf8
Eric Haszlakiewicz [Fri, 3 Jan 2020 13:32:53 +0000 (08:32 -0500)]
Merge pull request #526 from dota17/addTestCase_printbuf
Increased the test coverage of printbuf.c 82% to 92%.
Eric Haszlakiewicz [Fri, 3 Jan 2020 13:31:41 +0000 (08:31 -0500)]
Merge pull request #525 from dota17/addPointerTestcase
update pointer test case
chenguoping [Fri, 3 Jan 2020 06:34:35 +0000 (14:34 +0800)]
Increased the test coverage of printbuf.c 82% to 92%.
Eric Haszlakiewicz [Fri, 3 Jan 2020 03:22:57 +0000 (22:22 -0500)]
Merge pull request #523 from dota17/updatetestcase
update tsetcase for tokener_c
Eric Haszlakiewicz [Fri, 3 Jan 2020 03:22:09 +0000 (22:22 -0500)]
Merge pull request #522 from dota17/addVisitTestcase
update json_visit testcase
dota17 [Thu, 2 Jan 2020 08:18:59 +0000 (16:18 +0800)]
update tsetcase for tokener_c
dota17 [Tue, 31 Dec 2019 03:27:09 +0000 (11:27 +0800)]
update json_visit testcase
dota17 [Mon, 30 Dec 2019 01:45:28 +0000 (09:45 +0800)]
update pointer test case
Eric Haszlakiewicz [Sun, 29 Dec 2019 21:02:04 +0000 (16:02 -0500)]
Merge pull request #519 from dota17/addTestCase_obj_token
Add test case obj token
chenguoping [Fri, 27 Dec 2019 07:39:31 +0000 (15:39 +0800)]
pointer types discards qualifiers
chenguoping [Fri, 27 Dec 2019 07:07:00 +0000 (15:07 +0800)]
add testcases of object and token
Eric Haszlakiewicz [Fri, 13 Dec 2019 03:30:15 +0000 (22:30 -0500)]
Merge pull request #512 from JaapKeuter/cmake_test
Properly append to CMAKE_C_FLAGS string
Jaap Keuter [Thu, 12 Dec 2019 20:28:03 +0000 (21:28 +0100)]
Properly append to CMAKE_C_FLAGS string
Contrary to other CMAKE variables the CMAKE_C_FLAGS variable is the
composed string of flags for the C compiler. It is therefore not a list
to append to. Current implementation results in these incorrect CFLAGS,
e.g., "-O2 -g -fblahblah;-UNDEBUG". Extending the CFLAGS this way
results in the proper CFLAGS, e.g., "-O2 -g -fblahblah -UNDEBUG".
Eric Haszlakiewicz [Fri, 6 Dec 2019 05:15:14 +0000 (00:15 -0500)]
Set cmake policy CMP0075, to have check_include_file use the value of CMAKE_REQUIRED_LIBRARIES (currently, adds -lm). See issue #510.
Eric Haszlakiewicz [Fri, 6 Dec 2019 04:18:59 +0000 (23:18 -0500)]
Undefine NDEBUG for tests - cmake version. See issue #501.
Eric Haszlakiewicz [Fri, 6 Dec 2019 04:18:46 +0000 (23:18 -0500)]
Merge pull request #501 from andy5995/iss_406-2
undefine NDEBUG for tests
Eric Haszlakiewicz [Mon, 2 Dec 2019 04:42:40 +0000 (23:42 -0500)]
Add a shim script to ease shift from autoconf to cmake.
Eric Haszlakiewicz [Wed, 27 Nov 2019 04:01:27 +0000 (23:01 -0500)]
Add a few missing features to the cmake setup that are present in configure.ac:
Include all compiler warnings, and provide DISABLE_WERROR to make them not be errors.
Define _REENTRANT, if setting it works.
Set -Bsymbolic-functions, and provide DISABLE_BSYMBOLIC to turn that off.
Implement the check for HAS_GNU_WARNING_LONG
Eric Haszlakiewicz [Tue, 26 Nov 2019 04:26:48 +0000 (23:26 -0500)]
Set the soversion in the cmake built library, and arrange for the file name to be generated appropriately too.
Eric Haszlakiewicz [Sun, 24 Nov 2019 04:55:04 +0000 (23:55 -0500)]
Fix test_util_file for VS2013 too, but skip all the tests for anything older than that because the limitations are too inconvenient.
Eric Haszlakiewicz [Sun, 24 Nov 2019 04:14:24 +0000 (23:14 -0500)]
Fix up the test_util_file test for builds on Windows VS2015.
Eric Haszlakiewicz [Sun, 24 Nov 2019 01:31:14 +0000 (20:31 -0500)]
Fix some Windows compile issues, add JSON_EXPORT's, fix bogus character escapes, define __func__ and omit unistd.h if needed.
Eric Haszlakiewicz [Sat, 23 Nov 2019 20:34:23 +0000 (15:34 -0500)]
Get the cmake build a bit closer to the autoconf one: include json_visit.h, and fix the version stamped in json-c.pc.
Eric Haszlakiewicz [Sat, 23 Nov 2019 20:15:48 +0000 (15:15 -0500)]
Build and run the tests as part of the cmake build.
Eric Haszlakiewicz [Sat, 23 Nov 2019 17:05:28 +0000 (12:05 -0500)]
Fix memory leaks in test_double_serializer, and make sure all tests return 0 at the end of main().
Eric Haszlakiewicz [Sat, 23 Nov 2019 17:03:27 +0000 (12:03 -0500)]
Add a quick way (JSONC_TEST_TRACE=1) to turn on shell tracing in tests.
Eric Haszlakiewicz [Sat, 23 Nov 2019 03:56:33 +0000 (22:56 -0500)]
Extend test_double_serializer to check NaN and Infinity handling.
Eric Haszlakiewicz [Mon, 11 Nov 2019 01:35:30 +0000 (20:35 -0500)]
Define vars earlier to fix old Windows builds.
Eric Haszlakiewicz [Sun, 10 Nov 2019 05:12:27 +0000 (00:12 -0500)]
Add a json_object_from_fd_ex() function, to allow the max nesting depth to be specified.
Eric Haszlakiewicz [Sun, 10 Nov 2019 05:10:28 +0000 (00:10 -0500)]
Add a test for serializing the double value -1.0.
Eric Haszlakiewicz [Fri, 27 Sep 2019 02:23:52 +0000 (22:23 -0400)]
Merge pull request #505 from grdowns/vcpkg-instructions
Add vcpkg installation instructions
grdowns [Fri, 27 Sep 2019 00:11:49 +0000 (17:11 -0700)]
Update dependencies
grdowns [Fri, 27 Sep 2019 00:09:39 +0000 (17:09 -0700)]
Add vcpkg installation instructions
Eric Haszlakiewicz [Mon, 9 Sep 2019 02:42:36 +0000 (22:42 -0400)]
Issue #488: use JSON_EXPORT on functions so they are properly exported on Windows.
Eric Haszlakiewicz [Mon, 9 Sep 2019 02:27:30 +0000 (22:27 -0400)]
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.
Eric Haszlakiewicz [Mon, 9 Sep 2019 01:35:37 +0000 (21:35 -0400)]
Add a json_tokener_get_parse_end() function to replace direct access of tok->char_offset.
Eric Haszlakiewicz [Mon, 9 Sep 2019 01:34:13 +0000 (21:34 -0400)]
Minor cleanup of includes in a couple of tests.
Eric Haszlakiewicz [Mon, 12 Aug 2019 00:30:45 +0000 (00:30 +0000)]
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.
andy5995 [Mon, 29 Jul 2019 19:51:21 +0000 (14:51 -0500)]
undefine NDEBUG for tests
(closes #406)
Eric Haszlakiewicz [Sat, 27 Jul 2019 13:29:57 +0000 (09:29 -0400)]
Merge pull request #499 from andy5995/travis_valgrind
.travis.yml:test on more recent clang and gcc versions
andy5995 [Sat, 27 Jul 2019 04:51:18 +0000 (23:51 -0500)]
add xenial default clang with CHECK enabled
andy5995 [Sat, 27 Jul 2019 04:36:01 +0000 (23:36 -0500)]
add missing dist
andy5995 [Sat, 27 Jul 2019 04:15:06 +0000 (23:15 -0500)]
manually use apt-get to install packages on bionic
andy5995 [Sat, 27 Jul 2019 03:42:53 +0000 (22:42 -0500)]
add tests on bionic beaver
andy5995 [Fri, 26 Jul 2019 04:16:09 +0000 (23:16 -0500)]
revert toolchain back to "test"
andy5995 [Fri, 26 Jul 2019 04:10:14 +0000 (23:10 -0500)]
change key
andy5995 [Fri, 26 Jul 2019 04:00:50 +0000 (23:00 -0500)]
use "non-test" ppa
Maybe something weird about how gcc is configured with the test
toolchain?
andy5995 [Thu, 25 Jul 2019 19:11:31 +0000 (14:11 -0500)]
remove useless condition that shows logs
andy5995 [Wed, 24 Jul 2019 19:20:07 +0000 (14:20 -0500)]
install doxygen so 'make distcheck' can succeed
andy5995 [Wed, 24 Jul 2019 19:13:23 +0000 (14:13 -0500)]
test for more compilers
andy5995 [Wed, 24 Jul 2019 18:30:10 +0000 (13:30 -0500)]
show the logs if tests fail
andy5995 [Wed, 24 Jul 2019 06:08:30 +0000 (01:08 -0500)]
.travis.yml:install valgrind
(#498)
Eric Haszlakiewicz [Sat, 27 Jul 2019 03:08:11 +0000 (23:08 -0400)]
Merge pull request #495 from andy5995/README_typos
README.md:fix 2 typos
andy5995 [Fri, 26 Jul 2019 17:59:24 +0000 (12:59 -0500)]
"make its use in" [skip ci]
Eric Haszlakiewicz [Fri, 26 Jul 2019 13:48:34 +0000 (09:48 -0400)]
Merge pull request #500 from andy5995/add_missing_test_deps
test/Makefile.am:add missing deps for test1 and test2
andy5995 [Fri, 26 Jul 2019 03:55:07 +0000 (22:55 -0500)]
partial revert (make use) [skip ci]
Eric Haszlakiewicz [Fri, 26 Jul 2019 03:35:38 +0000 (03:35 +0000)]
Issue #498: Fix a memory leak bug introduced in test_double_serializer in
485f2a02 by adding a json_object_put call.
Eric Haszlakiewicz [Fri, 26 Jul 2019 02:58:22 +0000 (22:58 -0400)]
Merge pull request #496 from andy5995/pointer_doc
json_pointer.h:suggest minor grammar improvement for pointer doc
andy5995 [Thu, 25 Jul 2019 19:59:56 +0000 (14:59 -0500)]
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
andy5995 [Wed, 24 Jul 2019 04:53:06 +0000 (23:53 -0500)]
json_pointer.h:suggest minor grammar improvement for pointer doc
andy5995 [Wed, 24 Jul 2019 04:43:59 +0000 (23:43 -0500)]
README.md:fix 2 typos
Eric Haszlakiewicz [Sun, 9 Jun 2019 18:05:46 +0000 (14:05 -0400)]
Merge pull request #491 from ploxiln/disable_werror
build: add option --disable-werror to configure
Pierce Lopez [Sun, 9 Jun 2019 16:10:14 +0000 (12:10 -0400)]
tests: appease -Wwrite-strings
Pierce Lopez [Sun, 9 Jun 2019 14:55:50 +0000 (10:55 -0400)]
build: fix compiler option -Wwrite-strings
was typod as -Wwrite-string
Pierce Lopez [Sun, 9 Jun 2019 14:52:08 +0000 (10:52 -0400)]
build: add --disable-werror option to configure
to omit -Werror compiler option
Eric Haszlakiewicz [Fri, 31 May 2019 02:38:29 +0000 (22:38 -0400)]
Merge pull request #485 from myd7349/fix-cmake-module
Install CMake module files
Eric Haszlakiewicz [Tue, 28 May 2019 02:44:22 +0000 (02:44 +0000)]
Issue #486: append a missing ".0" to negative double values too.
myd7349 [Sat, 18 May 2019 11:44:29 +0000 (19:44 +0800)]
Install CMake module files
Eric Haszlakiewicz [Sat, 26 Jan 2019 15:55:50 +0000 (10:55 -0500)]
Merge pull request #474 from Jehan/fix-pc-file-cmake
Installation directories empty with CMake in pkg-config.
Jehan [Sat, 26 Jan 2019 11:30:40 +0000 (12:30 +0100)]
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.
Eric Haszlakiewicz [Thu, 24 Jan 2019 03:47:27 +0000 (22:47 -0500)]
Merge pull request #473 from besser82/fixup/docs_utf8
Convert ChangeLog to valid UTF-8 encoding.
Björn Esser [Tue, 22 Jan 2019 16:07:00 +0000 (17:07 +0100)]
Clean trailing white-spaces in ChangeLog.
Björn Esser [Tue, 22 Jan 2019 15:59:50 +0000 (16:59 +0100)]
Convert ChangeLog to valid UTF-8 encoding.
Eric Haszlakiewicz [Wed, 19 Dec 2018 16:09:01 +0000 (11:09 -0500)]
Merge pull request #468 from rkalidas/compiler-fixes
Fix compiler warnings
Rubasri Kalidas [Tue, 18 Dec 2018 17:30:57 +0000 (11:30 -0600)]
Fix compiler warnings
Eric Haszlakiewicz [Wed, 12 Dec 2018 01:59:08 +0000 (20:59 -0500)]
Switch to building a dynamic lib by default. Tweak language in the README.md slightly. Inspired by PR#452.
Eric Haszlakiewicz [Wed, 12 Dec 2018 01:17:43 +0000 (20:17 -0500)]
Merge pull request #453 from darjankrijan/master
Fixed misalignment in JSON string due to space after \n being printed...
Darjan Krijan [Fri, 7 Dec 2018 16:39:59 +0000 (17:39 +0100)]
Removed newly created test case and incorporated it into test1.test and test2.test
Darjan Krijan [Fri, 7 Dec 2018 16:30:15 +0000 (17:30 +0100)]
Added test cases for spaced pretty and pretty_tab used together
Eric Haszlakiewicz [Fri, 30 Nov 2018 14:49:35 +0000 (09:49 -0500)]
Merge pull request #454 from ramiropolla/json_object_private
json_object_private: save 8 bytes in struct json_object in 64-bit arc…
Eric Haszlakiewicz [Thu, 29 Nov 2018 01:39:42 +0000 (20:39 -0500)]
Merge pull request #461 from andy5995/issue_422
json_object.c:set errno in json_object_get_double()
Eric Haszlakiewicz [Thu, 29 Nov 2018 01:39:13 +0000 (20:39 -0500)]
Merge pull request #462 from andy5995/issue_460
json_object.h:document json_object_new_string_len()
andy5995 [Wed, 28 Nov 2018 22:55:19 +0000 (16:55 -0600)]
remove [in] from params description
Keeping this would be inconsistent with the other documentation
andy5995 [Tue, 27 Nov 2018 17:35:45 +0000 (11:35 -0600)]
json_object.h:document json_object_new_string_len()
I also added a couple trivial, but related, suggestions.
closes #460
andy5995 [Tue, 27 Nov 2018 03:12:06 +0000 (21:12 -0600)]
json_object.c:set errno in json_object_get_double()
closes #422
Eric Haszlakiewicz [Mon, 26 Nov 2018 02:19:02 +0000 (21:19 -0500)]
Merge pull request #459 from andy5995/issue_438
README.html:fix link to Doxygen docs, remove WIN32 link