]> granicus.if.org Git - json-c/log
json-c
4 years agoFixes various Wreturn-type and Wimplicit-fallthrough errors on Mingw-w64
Jehan [Sun, 15 Mar 2020 22:29:37 +0000 (23:29 +0100)]
Fixes various Wreturn-type and Wimplicit-fallthrough errors on Mingw-w64

This is a recent regression since commit
6359b798479d379a3202e02c6a938d9b40c0d856 which added various assert(0)
calls (often replacing return-s).
With Ming-W64 compiler, json-c build was failing with various errors of
the sort:

> /home/jehan/dev/src/json-c/json_object.c: In function 'json_object_int_inc':
> /home/jehan/dev/src/json-c/json_object.c:841:1: error: control reaches end of non-void function [-Werror=return-type]
>   841 | }
>       | ^
> In file included from /home/jehan/dev/src/json-c/json_object.c:17:
> /home/jehan/dev/src/json-c/json_object.c: In function 'json_object_get_double':
> /home/jehan/.local/share/crossroad/roads/w64/json-c/include/assert.h:76:4: error: this statement may fall through [-Werror=implicit-fallthrough=]
>    76 |   (_assert(#_Expression,__FILE__,__LINE__),0))
>       |    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> /home/jehan/dev/src/json-c/json_object.c:1070:7: note: in expansion of macro 'assert'
>  1070 |       assert(0);
>       |       ^~~~~~
> /home/jehan/dev/src/json-c/json_object.c:1072:3: note: here
>  1072 |   case json_type_boolean:
>       |   ^~~~

The problem is that Mingw-w64 does not consider assert() as a noreturn
(even assert(0)), because it has to be compatible by Microsoft
libraries. See the discussion here:
https://sourceforge.net/p/mingw-w64/bugs/306/

Instead let's create a new json_abort() function which is basically just
an abort() function with an optional message, for such cases where
abortion was non-conditional (using assert() and using the assertion
condition as a message here was clearly a misuse of the function). And
mark json_abort() as 'noreturn', as well as 'cold' for optimization
purpose (this is code we expect to never run, unless there is a bug,
that is).

Finally let's use this json_abort() instead of previous misused assert()
calls.

4 years agoMerge pull request #546 from dota17/make_unistall
Eric Haszlakiewicz [Wed, 11 Mar 2020 03:12:13 +0000 (22:12 -0500)]
Merge pull request #546 from dota17/make_unistall

Add uninstall target in cmake

4 years agodelete -r in uninstall
dota17 [Wed, 11 Mar 2020 02:47:04 +0000 (10:47 +0800)]
delete -r in uninstall

4 years agoMerge pull request #547 from dota17/assert_test
Eric Haszlakiewicz [Tue, 3 Mar 2020 13:54:21 +0000 (07:54 -0600)]
Merge pull request #547 from dota17/assert_test

modify json-c default build type, and fix up the assert() errors in t…

4 years agomodify RELEASE
dota17 [Tue, 3 Mar 2020 06:16:13 +0000 (14:16 +0800)]
modify RELEASE

4 years agoupdate testcase and delete debug -O0 build
dota17 [Mon, 2 Mar 2020 12:19:35 +0000 (20:19 +0800)]
update testcase and delete debug -O0 build

4 years agoFollow up the PR#542: improve assert() calls, simplify code in json_object_equal().
Eric Haszlakiewicz [Mon, 2 Mar 2020 02:08:49 +0000 (02:08 +0000)]
Follow up the PR#542: improve assert() calls, simplify code in json_object_equal().

4 years agoMerge pull request #542 from dota17/adduint64_final
Eric Haszlakiewicz [Sun, 1 Mar 2020 13:51:26 +0000 (08:51 -0500)]
Merge pull request #542 from dota17/adduint64_final

add uint64 data to json-c

4 years agomodify json-c default build type, and fix up the assert() errors in testcase
dota17 [Sat, 29 Feb 2020 07:32:42 +0000 (15:32 +0800)]
modify json-c default build type, and fix up the assert() errors in testcase

4 years agoupdate json_object.c and testcase, delete json_object_uint_inc()
dota17 [Fri, 28 Feb 2020 03:18:48 +0000 (11:18 +0800)]
update json_object.c and testcase, delete json_object_uint_inc()

4 years agomodify partial functions and testcase, in order to support automatic conversion for...
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

4 years agoAdd uninstall target in cmake
dota17 [Thu, 27 Feb 2020 08:00:09 +0000 (16:00 +0800)]
Add uninstall target in cmake

4 years agomodify the json_object, replace c_int64/c_uint64 with struct{union{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},...}

4 years agoMerge pull request #545 from dota17/make_doc
Eric Haszlakiewicz [Thu, 27 Feb 2020 01:56:22 +0000 (20:56 -0500)]
Merge pull request #545 from dota17/make_doc

add doc target in cmake

4 years agoadd doc target on cmake
dota17 [Wed, 26 Feb 2020 07:39:27 +0000 (15:39 +0800)]
add doc target on cmake

4 years agoMerge pull request #544 from dota17/distcheck
Eric Haszlakiewicz [Wed, 26 Feb 2020 02:48:35 +0000 (21:48 -0500)]
Merge pull request #544 from dota17/distcheck

Increase distcheck target in cmake

4 years agoMerge pull request #543 from dota17/readme
Eric Haszlakiewicz [Wed, 26 Feb 2020 02:38:18 +0000 (21:38 -0500)]
Merge pull request #543 from dota17/readme

Readme

4 years agoIncrease distcheck target in cmake
dota17 [Fri, 21 Feb 2020 04:16:51 +0000 (12:16 +0800)]
Increase distcheck target in cmake

4 years agoUpdate README.md
Chen [Tue, 25 Feb 2020 08:20:41 +0000 (16:20 +0800)]
Update README.md

4 years agoAdded documentation for camke-configure
dota17 [Tue, 25 Feb 2020 07:01:05 +0000 (15:01 +0800)]
Added documentation for camke-configure

4 years agoadd uint64 data to json-c
dota17 [Thu, 20 Feb 2020 07:17:05 +0000 (15:17 +0800)]
add uint64 data to json-c

4 years agoIssue #539: use a internal-only serializer function in json_object_new_double_s(...
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().

4 years agoIssue #539: be sure to clean up at the end of test_set_value.
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.

4 years agoIssue #539: reset the serializer when json_object_set_double() is called and the...
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.

4 years agoMerge pull request #531 from dota17/utf8test
Eric Haszlakiewicz [Thu, 6 Feb 2020 02:56:06 +0000 (21:56 -0500)]
Merge pull request #531 from dota17/utf8test

validate utf-8 string

5 years agoMerge pull request #536 from dota17/new_null
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()

5 years agoupdate comment
dota17 [Wed, 22 Jan 2020 01:56:52 +0000 (09:56 +0800)]
update comment

5 years agoadd json_object_new_null
dota17 [Mon, 20 Jan 2020 07:00:11 +0000 (15:00 +0800)]
add json_object_new_null

5 years agoupdate code
dota17 [Fri, 17 Jan 2020 07:33:44 +0000 (15:33 +0800)]
update code

5 years agoMerge pull request #533 from sunpoet/master
Eric Haszlakiewicz [Mon, 13 Jan 2020 03:42:02 +0000 (22:42 -0500)]
Merge pull request #533 from sunpoet/master

Fix "make check"

5 years agoFix 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.

5 years agotest utf8
dota17 [Wed, 8 Jan 2020 11:42:05 +0000 (19:42 +0800)]
test utf8

5 years agoMerge pull request #526 from dota17/addTestCase_printbuf
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%.

5 years agoMerge pull request #525 from dota17/addPointerTestcase
Eric Haszlakiewicz [Fri, 3 Jan 2020 13:31:41 +0000 (08:31 -0500)]
Merge pull request #525 from dota17/addPointerTestcase

update pointer test case

5 years agoIncreased the test coverage of printbuf.c 82% to 92%.
chenguoping [Fri, 3 Jan 2020 06:34:35 +0000 (14:34 +0800)]
Increased the test coverage of printbuf.c 82% to 92%.

5 years agoMerge pull request #523 from dota17/updatetestcase
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

5 years agoMerge pull request #522 from dota17/addVisitTestcase
Eric Haszlakiewicz [Fri, 3 Jan 2020 03:22:09 +0000 (22:22 -0500)]
Merge pull request #522 from dota17/addVisitTestcase

update json_visit testcase

5 years agoupdate tsetcase for tokener_c
dota17 [Thu, 2 Jan 2020 08:18:59 +0000 (16:18 +0800)]
update tsetcase for tokener_c

5 years agoupdate json_visit testcase
dota17 [Tue, 31 Dec 2019 03:27:09 +0000 (11:27 +0800)]
update json_visit testcase

5 years agoupdate pointer test case
dota17 [Mon, 30 Dec 2019 01:45:28 +0000 (09:45 +0800)]
update pointer test case

5 years agoMerge pull request #519 from dota17/addTestCase_obj_token
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

5 years agopointer types discards qualifiers
chenguoping [Fri, 27 Dec 2019 07:39:31 +0000 (15:39 +0800)]
pointer types discards qualifiers

5 years agoadd testcases of object and token
chenguoping [Fri, 27 Dec 2019 07:07:00 +0000 (15:07 +0800)]
add testcases of object and token

5 years agoMerge pull request #512 from JaapKeuter/cmake_test
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

5 years agoProperly 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".

5 years agoSet cmake policy CMP0075, to have check_include_file use the value of CMAKE_REQUIRED_...
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.

5 years agoUndefine NDEBUG for tests - cmake version. See issue #501.
Eric Haszlakiewicz [Fri, 6 Dec 2019 04:18:59 +0000 (23:18 -0500)]
Undefine NDEBUG for tests - cmake version.  See issue #501.

5 years agoMerge pull request #501 from andy5995/iss_406-2
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

5 years agoAdd a shim script to ease shift from autoconf to cmake.
Eric Haszlakiewicz [Mon, 2 Dec 2019 04:42:40 +0000 (23:42 -0500)]
Add a shim script to ease shift from autoconf to cmake.

5 years agoAdd a few missing features to the cmake setup that are present in configure.ac:
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

5 years agoSet the soversion in the cmake built library, and arrange for the file name to be...
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.

5 years agoFix test_util_file for VS2013 too, but skip all the tests for anything older than...
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.

5 years agoFix up the test_util_file test for builds on Windows VS2015.
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.

5 years agoFix some Windows compile issues, add JSON_EXPORT's, fix bogus character escapes,...
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.

5 years agoGet the cmake build a bit closer to the autoconf one: include json_visit.h, and fix...
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.

5 years agoBuild and run the tests as part of the cmake build.
Eric Haszlakiewicz [Sat, 23 Nov 2019 20:15:48 +0000 (15:15 -0500)]
Build and run the tests as part of the cmake build.

5 years agoFix memory leaks in test_double_serializer, and make sure all tests return 0 at the...
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().

5 years agoAdd a quick way (JSONC_TEST_TRACE=1) to turn on shell tracing in tests.
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.

5 years agoExtend test_double_serializer to check NaN and Infinity handling.
Eric Haszlakiewicz [Sat, 23 Nov 2019 03:56:33 +0000 (22:56 -0500)]
Extend test_double_serializer to check NaN and Infinity handling.

5 years agoDefine vars earlier to fix old Windows builds.
Eric Haszlakiewicz [Mon, 11 Nov 2019 01:35:30 +0000 (20:35 -0500)]
Define vars earlier to fix old Windows builds.

5 years agoAdd a json_object_from_fd_ex() function, to allow the max nesting depth to be specified.
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.

5 years agoAdd a test for serializing the double value -1.0.
Eric Haszlakiewicz [Sun, 10 Nov 2019 05:10:28 +0000 (00:10 -0500)]
Add a test for serializing the double value -1.0.

5 years agoMerge pull request #505 from grdowns/vcpkg-instructions
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

5 years agoUpdate dependencies
grdowns [Fri, 27 Sep 2019 00:11:49 +0000 (17:11 -0700)]
Update dependencies

5 years agoAdd vcpkg installation instructions
grdowns [Fri, 27 Sep 2019 00:09:39 +0000 (17:09 -0700)]
Add vcpkg installation instructions

5 years agoIssue #488: use JSON_EXPORT on functions so they are properly exported on Windows.
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.

5 years agoIssue #463: fix newlocale() call to use LC_NUMERIC_MASK instead of LC_NUMERIC, and...
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.

5 years agoAdd a json_tokener_get_parse_end() function to replace direct access of tok->char_offset.
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.

5 years agoMinor cleanup of includes in a couple of tests.
Eric Haszlakiewicz [Mon, 9 Sep 2019 01:34:13 +0000 (21:34 -0400)]
Minor cleanup of includes in a couple of tests.

5 years agoAdd an explicit cast to double to squash a -Wimplicit-int-float-conversion warning.
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.

5 years agoundefine NDEBUG for tests
andy5995 [Mon, 29 Jul 2019 19:51:21 +0000 (14:51 -0500)]
undefine NDEBUG for tests

(closes #406)

5 years agoMerge pull request #499 from andy5995/travis_valgrind
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

5 years agoadd xenial default clang with CHECK enabled
andy5995 [Sat, 27 Jul 2019 04:51:18 +0000 (23:51 -0500)]
add xenial default clang with CHECK enabled

5 years agoadd missing dist
andy5995 [Sat, 27 Jul 2019 04:36:01 +0000 (23:36 -0500)]
add missing dist

5 years agomanually use apt-get to install packages on bionic
andy5995 [Sat, 27 Jul 2019 04:15:06 +0000 (23:15 -0500)]
manually use apt-get to install packages on bionic

5 years agoadd tests on bionic beaver
andy5995 [Sat, 27 Jul 2019 03:42:53 +0000 (22:42 -0500)]
add tests on bionic beaver

5 years agorevert toolchain back to "test"
andy5995 [Fri, 26 Jul 2019 04:16:09 +0000 (23:16 -0500)]
revert toolchain back to "test"

5 years agochange key
andy5995 [Fri, 26 Jul 2019 04:10:14 +0000 (23:10 -0500)]
change key

5 years agouse "non-test" ppa
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?

5 years agoremove useless condition that shows logs
andy5995 [Thu, 25 Jul 2019 19:11:31 +0000 (14:11 -0500)]
remove useless condition that shows logs

5 years agoinstall doxygen so 'make distcheck' can succeed
andy5995 [Wed, 24 Jul 2019 19:20:07 +0000 (14:20 -0500)]
install doxygen so 'make distcheck' can succeed

5 years agotest for more compilers
andy5995 [Wed, 24 Jul 2019 19:13:23 +0000 (14:13 -0500)]
test for more compilers

5 years agoshow the logs if tests fail
andy5995 [Wed, 24 Jul 2019 18:30:10 +0000 (13:30 -0500)]
show the logs if tests fail

5 years ago.travis.yml:install valgrind
andy5995 [Wed, 24 Jul 2019 06:08:30 +0000 (01:08 -0500)]
.travis.yml:install valgrind

(#498)

5 years agoMerge pull request #495 from andy5995/README_typos
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

5 years ago"make its use in" [skip ci]
andy5995 [Fri, 26 Jul 2019 17:59:24 +0000 (12:59 -0500)]
"make its use in" [skip ci]

5 years agoMerge pull request #500 from andy5995/add_missing_test_deps
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

5 years agopartial revert (make use) [skip ci]
andy5995 [Fri, 26 Jul 2019 03:55:07 +0000 (22:55 -0500)]
partial revert (make use) [skip ci]

5 years agoIssue #498: Fix a memory leak bug introduced in test_double_serializer in 485f2a02...
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.

5 years agoMerge pull request #496 from andy5995/pointer_doc
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

5 years agotest/Makefile.am:add missing deps for test1 and test2
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

5 years agojson_pointer.h:suggest minor grammar improvement for pointer doc
andy5995 [Wed, 24 Jul 2019 04:53:06 +0000 (23:53 -0500)]
json_pointer.h:suggest minor grammar improvement for pointer doc

5 years agoREADME.md:fix 2 typos
andy5995 [Wed, 24 Jul 2019 04:43:59 +0000 (23:43 -0500)]
README.md:fix 2 typos

5 years agoMerge pull request #491 from ploxiln/disable_werror
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

5 years agotests: appease -Wwrite-strings
Pierce Lopez [Sun, 9 Jun 2019 16:10:14 +0000 (12:10 -0400)]
tests: appease -Wwrite-strings

5 years agobuild: fix compiler option -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

5 years agobuild: add --disable-werror option to configure
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

5 years agoMerge pull request #485 from myd7349/fix-cmake-module
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

5 years agoIssue #486: append a missing ".0" to negative double values too.
Eric Haszlakiewicz [Tue, 28 May 2019 02:44:22 +0000 (02:44 +0000)]
Issue #486: append a missing ".0" to negative double values too.

5 years agoInstall CMake module files
myd7349 [Sat, 18 May 2019 11:44:29 +0000 (19:44 +0800)]
Install CMake module files