]> granicus.if.org Git - json-c/log
json-c
6 years agoarraylist: Fix names of parameters for callback function
max [Fri, 1 Jun 2018 15:21:06 +0000 (18:21 +0300)]
arraylist: Fix names of parameters for callback function

6 years agoAlways create debug info (pdb file) even for release builds.
Eric Haszlakiewicz [Mon, 28 May 2018 01:50:57 +0000 (21:50 -0400)]
Always create debug info (pdb file) even for release builds.

6 years agoTry the appveyor changes again, using %Configuration% instead of "Debug"
Eric Haszlakiewicz [Sun, 27 May 2018 22:20:32 +0000 (18:20 -0400)]
Try the appveyor changes again, using %Configuration% instead of "Debug"

6 years agoInclude the json-c.lib, .pdb and .exp files in the zip file created by the appveyor...
Eric Haszlakiewicz [Sun, 27 May 2018 20:07:11 +0000 (16:07 -0400)]
Include the json-c.lib, .pdb and .exp files in the zip file created by the appveyor build, since it seems they're needed for linking and debugging.

6 years agoMerge pull request #410 from janczer/fix-typos
Eric Haszlakiewicz [Wed, 25 Apr 2018 02:01:09 +0000 (22:01 -0400)]
Merge pull request #410 from janczer/fix-typos

Fixed typos

6 years agoFixed typos
janczer [Tue, 24 Apr 2018 14:00:38 +0000 (16:00 +0200)]
Fixed typos

6 years agoIssue #407: fix incorrect casts in calls to ctype functions (isdigit and isspace...
Eric Haszlakiewicz [Sun, 25 Mar 2018 22:25:58 +0000 (18:25 -0400)]
Issue #407: fix incorrect casts in calls to ctype functions (isdigit and isspace) so we don't crash when asserts are enabled on certain platforms and characters > 128 are parsed.

6 years agoAdd an parse test for content starting with a UTF8 BOM, which is _not_ a valid start...
Eric Haszlakiewicz [Sun, 25 Mar 2018 22:23:42 +0000 (18:23 -0400)]
Add an parse test for content starting with a UTF8 BOM, which is _not_ a valid start to a JSON message.

6 years agoUpdate the change log for the 0.13.1 release.
Eric Haszlakiewicz [Tue, 6 Mar 2018 03:54:57 +0000 (22:54 -0500)]
Update the change log for the 0.13.1 release.

6 years agoIssue #396: check for toolchain compatibilty with _REENTRANT before adding it to...
Eric Haszlakiewicz [Mon, 5 Mar 2018 03:32:45 +0000 (22:32 -0500)]
Issue #396: check for toolchain compatibilty with _REENTRANT before adding it to CFLAGS.

6 years agoMerge pull request #402 from derwolfe/fuzz
Eric Haszlakiewicz [Mon, 19 Feb 2018 18:54:18 +0000 (13:54 -0500)]
Merge pull request #402 from derwolfe/fuzz

Add fuzzers from OSS-Fuzz

7 years agopull in fuzzers, add CI scripts later
Chris Wolfe [Tue, 6 Feb 2018 01:24:51 +0000 (19:24 -0600)]
pull in fuzzers, add CI scripts later

7 years agoMerge pull request #399 from jonathan-wiens/bugfix/initialize_variable
Eric Haszlakiewicz [Sat, 27 Jan 2018 04:46:33 +0000 (23:46 -0500)]
Merge pull request #399 from jonathan-wiens/bugfix/initialize_variable

Avoid uninitialized variable warnings

7 years agoAvoid uninitialized variable warnings
Jonathan Wiens [Wed, 17 Jan 2018 14:57:52 +0000 (15:57 +0100)]
Avoid uninitialized variable warnings

Fix json_object_object_foreach to avoid uninitialized variable warnings
using ANSI C or MSC.

7 years agoBump the major version of the .so library generated up to 4.0 to avoid conflicts...
Eric Haszlakiewicz [Tue, 16 Jan 2018 04:31:55 +0000 (23:31 -0500)]
Bump the major version of the .so library generated up to 4.0 to avoid conflicts because some downstream packagers of json-c had already done their own bump to ".so.3" for a much older 0.12 release.

7 years agoPR#394: fix breakage with VS build.
Eric Haszlakiewicz [Sun, 24 Dec 2017 19:42:58 +0000 (14:42 -0500)]
PR#394: fix breakage with VS build.

7 years agoPR#394: don't always append the ".0" if the double value rounds to zero because some...
Eric Haszlakiewicz [Sun, 24 Dec 2017 18:45:52 +0000 (13:45 -0500)]
PR#394: don't always append the ".0" if the double value rounds to zero because some custom formats *will* include it (e.g. %.2f).
Also try to accomodate formats to explicitly exclude the decimal (e.g. %.0f).

7 years agoRemove the TRUE and FALSE defines.
Eric Haszlakiewicz [Sat, 23 Dec 2017 14:42:17 +0000 (09:42 -0500)]
Remove the TRUE and FALSE defines.

7 years agoMerge pull request #393 from besser82/enhancement/unsigned_refcount
Eric Haszlakiewicz [Sun, 17 Dec 2017 14:52:27 +0000 (09:52 -0500)]
Merge pull request #393 from besser82/enhancement/unsigned_refcount

json_object_private: Use unsigned 32-bit integer type for refcount

7 years agojson_object_private: Use unsigned 32-bit integer type for refcount
Björn Esser [Sat, 16 Dec 2017 16:09:39 +0000 (17:09 +0100)]
json_object_private: Use unsigned 32-bit integer type for refcount

7 years agoMerge pull request #389 from besser82/bugfix/invalid_free
Eric Haszlakiewicz [Thu, 14 Dec 2017 14:28:06 +0000 (09:28 -0500)]
Merge pull request #389 from besser82/bugfix/invalid_free

json_object: Avoid double free (and thus a segfault) when ref_count gets < 0

7 years agojson_object: Avoid invalid free (and thus a segfault) when ref_count gets < 0
Björn Esser [Wed, 13 Dec 2017 18:22:52 +0000 (19:22 +0100)]
json_object: Avoid invalid free (and thus a segfault) when ref_count gets < 0

7 years agoMerge pull request #386 from besser82/bugfix/aclocal_amflags
Eric Haszlakiewicz [Thu, 14 Dec 2017 03:03:20 +0000 (22:03 -0500)]
Merge pull request #386 from besser82/bugfix/aclocal_amflags

Makefile: Add ACLOCAL_AMFLAGS

7 years agoMerge pull request #391 from rikardfalkeborn/fix-const-function-define
Eric Haszlakiewicz [Thu, 14 Dec 2017 02:51:13 +0000 (21:51 -0500)]
Merge pull request #391 from rikardfalkeborn/fix-const-function-define

Fix non-GNUC define for JSON_C_CONST_FUNCTION

7 years agoFix non-GNUC define for JSON_C_CONST_FUNCTION
Rikard Falkeborn [Wed, 13 Dec 2017 21:24:50 +0000 (22:24 +0100)]
Fix non-GNUC define for JSON_C_CONST_FUNCTION

7 years agoMakefile: Add ACLOCAL_AMFLAGS
Björn Esser [Sun, 10 Dec 2017 15:29:41 +0000 (16:29 +0100)]
Makefile: Add ACLOCAL_AMFLAGS

This is recommended by the libtool manual.

7 years agoApply gcc's "const" attribute to the json_c_object_sizeof() function as an optimizer...
Eric Haszlakiewicz [Tue, 12 Dec 2017 23:26:51 +0000 (18:26 -0500)]
Apply gcc's "const" attribute to the json_c_object_sizeof() function as an optimizer hint.  Also, rename that function from json_object_sizeof().

7 years agoMerge pull request #388 from besser82/enhancement/json_object_sizeof
Eric Haszlakiewicz [Tue, 12 Dec 2017 23:14:40 +0000 (18:14 -0500)]
Merge pull request #388 from besser82/enhancement/json_object_sizeof

json_object: Add size_t json_object_sizeof()

7 years agoMerge pull request #387 from LeSpocky/doc
Eric Haszlakiewicz [Tue, 12 Dec 2017 14:13:36 +0000 (09:13 -0500)]
Merge pull request #387 from LeSpocky/doc

doc: Use other doxygen feature to specify mainpage

7 years agojson_object: Add size_t json_object_sizeof()
Björn Esser [Mon, 11 Dec 2017 11:55:40 +0000 (12:55 +0100)]
json_object: Add size_t json_object_sizeof()

7 years agodoc: Use other doxygen feature to specify mainpage
Alexander Dahl [Mon, 11 Dec 2017 08:46:28 +0000 (09:46 +0100)]
doc: Use other doxygen feature to specify mainpage

Previously a special tag was added to README.md to make this the
main page in Doxygen generated docs. When viewing the README on the
GitHub page this tag was not hidden.

After upgrading to Doxygen 1.8.8 (and above) in changeset
219025727dd7d981cf2fea7f2095570924e7bae7 a new Doxygen feature can be
used to specify the main page: Since release 1.8.3 Doxygen has a special
option to set a markdown file as main page. When using this option we
can drop the tag, making the README rendered by GitHub nice to look at.

Fixes: ae66b243690871f2daea5ae4b2a4669081d7c556
7 years agoRemove the previously deprecated lh_table_lookup() function, in favor of lh_table_loo...
Eric Haszlakiewicz [Sun, 10 Dec 2017 05:27:01 +0000 (00:27 -0500)]
Remove the previously deprecated lh_table_lookup() function, in favor of lh_table_lookup_ex().

7 years agoRemove the previously deprecated bits.h and the lh_abort() function.
Eric Haszlakiewicz [Sun, 10 Dec 2017 05:25:00 +0000 (00:25 -0500)]
Remove the previously deprecated bits.h and the lh_abort() function.

7 years agoDrop mention of README-WIN32.html in the release checklist.
Eric Haszlakiewicz [Sat, 9 Dec 2017 20:12:08 +0000 (15:12 -0500)]
Drop mention of README-WIN32.html in the release checklist.

7 years agoUpdate the master branch to version 0.13.99
Eric Haszlakiewicz [Sat, 9 Dec 2017 19:59:48 +0000 (14:59 -0500)]
Update the master branch to version 0.13.99

7 years agoTweak the release checklist slightly to fix problems noticed during this past release...
Eric Haszlakiewicz [Sat, 9 Dec 2017 19:59:05 +0000 (14:59 -0500)]
Tweak the release checklist slightly to fix problems noticed during this past release process.

7 years agoDon't include private headers when installing.
Eric Haszlakiewicz [Thu, 7 Dec 2017 23:24:08 +0000 (18:24 -0500)]
Don't include private headers when installing.

7 years agoUndeprecate the array_list, lh_table and printbuf typedefs, but move each to the...
Eric Haszlakiewicz [Thu, 7 Dec 2017 04:56:23 +0000 (23:56 -0500)]
Undeprecate the array_list, lh_table and printbuf typedefs, but move each to the corresponding header files.

7 years agoSquash doxygen warnings, and make a few slight improvements to the docs.
Eric Haszlakiewicz [Thu, 7 Dec 2017 04:53:12 +0000 (23:53 -0500)]
Squash doxygen warnings, and make a few slight improvements to the docs.

7 years agoUpgrade doxygen's Doxyfile to version 1.8.8
Eric Haszlakiewicz [Wed, 6 Dec 2017 05:27:53 +0000 (00:27 -0500)]
Upgrade doxygen's Doxyfile to version 1.8.8

7 years agoAdd a brief overview of each file to the docs.
Eric Haszlakiewicz [Wed, 6 Dec 2017 05:20:59 +0000 (00:20 -0500)]
Add a brief overview of each file to the docs.

7 years agoAdjust the description of json_object_iterator a bit.
Eric Haszlakiewicz [Tue, 5 Dec 2017 23:25:03 +0000 (18:25 -0500)]
Adjust the description of json_object_iterator a bit.

7 years agoRearrange README.md a bit and make it work better in the doxygen generated docs.
Eric Haszlakiewicz [Tue, 5 Dec 2017 23:01:43 +0000 (18:01 -0500)]
Rearrange README.md a bit and make it work better in the doxygen generated docs.
Also, add a table of contents, and a brief section on using json-c with links to
the header files most likely to be useful.

7 years agoAdd a couple more issues to the list of those closed for 0.13
Eric Haszlakiewicz [Tue, 5 Dec 2017 23:00:09 +0000 (18:00 -0500)]
Add a couple more issues to the list of those closed for 0.13

7 years agoDeprecated a few typedefs, add docs on json_object_iter, move json_number_chars and...
Eric Haszlakiewicz [Tue, 5 Dec 2017 14:20:59 +0000 (09:20 -0500)]
Deprecated a few typedefs, add docs on json_object_iter, move json_number_chars and json_hex-chars to json_object_private.h.

7 years agoCast to int64_t instead of long in test_int_add to fix the test on 32-bit platforms.
Eric Haszlakiewicz [Tue, 5 Dec 2017 04:32:12 +0000 (04:32 +0000)]
Cast to int64_t instead of long in test_int_add to fix the test on 32-bit platforms.

7 years agoAdd cast to int on tolower() to fix warnings about array subscripts.
Eric Haszlakiewicz [Tue, 5 Dec 2017 04:29:36 +0000 (04:29 +0000)]
Add cast to int on tolower() to fix warnings about array subscripts.

7 years agoMake sure to include the "*" on function pointer arguments to avoid a warnings from...
Eric Haszlakiewicz [Mon, 4 Dec 2017 23:17:52 +0000 (18:17 -0500)]
Make sure to include the "*" on function pointer arguments to avoid a warnings from VS2015.  See also PR#384.

7 years agoMerge pull request #384 from ssrlive/patch-1
Eric Haszlakiewicz [Mon, 4 Dec 2017 23:11:09 +0000 (18:11 -0500)]
Merge pull request #384 from ssrlive/patch-1

Fix a VS 2015 compiler warning.

7 years agoUpdate json_object.c
ssrlive [Mon, 4 Dec 2017 06:46:41 +0000 (14:46 +0800)]
Update json_object.c

7 years agoFix a VS 2015 compiler warning.
ssrlive [Mon, 4 Dec 2017 06:43:25 +0000 (14:43 +0800)]
Fix a VS 2015 compiler warning.

In VS 2015, the warning text is "warning C4550: expression evaluates to a function which is missing an argument list".

7 years agoAdd a change log entry for the upcoming 0.13 release.
Eric Haszlakiewicz [Sun, 3 Dec 2017 03:13:22 +0000 (22:13 -0500)]
Add a change log entry for the upcoming 0.13 release.

7 years agoClean up *.vg.out files too to "make distcheck" works.
Eric Haszlakiewicz [Thu, 30 Nov 2017 23:10:25 +0000 (18:10 -0500)]
Clean up *.vg.out files too to "make distcheck" works.

7 years agoIn json_object_deep_copy(), copy over _userdata, at least for json_type_string's...
Eric Haszlakiewicz [Thu, 30 Nov 2017 04:35:38 +0000 (23:35 -0500)]
In json_object_deep_copy(), copy over _userdata, at least for json_type_string's with the default serializer set, and provide a way for people using custom serializers to provide a custom shallow_copy method.

7 years agoAlways build the json_object_deep_copy() code, but conditionalize running it on a...
Eric Haszlakiewicz [Wed, 29 Nov 2017 22:57:51 +0000 (17:57 -0500)]
Always build the json_object_deep_copy() code, but conditionalize running it on a --benchmark command line option.

7 years agoRename _set_last_err() to _json_c_set_last_err().
Eric Haszlakiewicz [Wed, 29 Nov 2017 14:25:11 +0000 (09:25 -0500)]
Rename _set_last_err() to _json_c_set_last_err().

7 years agoMerge branch 'commodo-json_deep_copy'
Eric Haszlakiewicz [Wed, 29 Nov 2017 14:13:32 +0000 (09:13 -0500)]
Merge branch 'commodo-json_deep_copy'

7 years agoMerge branch 'json_deep_copy' of https://github.com/commodo/json-c into commodo-json_...
Eric Haszlakiewicz [Wed, 29 Nov 2017 14:12:59 +0000 (09:12 -0500)]
Merge branch 'json_deep_copy' of https://github.com/commodo/json-c into commodo-json_deep_copy

7 years agoRename json_object_add_int() to json_object_int_inc() and eliminate the "int64" varia...
Eric Haszlakiewicz [Mon, 27 Nov 2017 22:57:36 +0000 (17:57 -0500)]
Rename json_object_add_int() to json_object_int_inc() and eliminate the "int64" variant since we store 64-bit values internally anyway.

7 years agotests: add test_deep_copy test
Alexandru Ardelean [Fri, 16 Jun 2017 07:50:49 +0000 (10:50 +0300)]
tests: add test_deep_copy test

Seems to perform better than outputting to string
and re-parsing it.

BENCHMARK - 1000000 iterations of 'dst2 = json_tokener_parse(json_object_get_string(src2))' took 20 seconds
BENCHMARK - 1000000 iterations of 'dst2 = json_tokener_parse(json_object_get_string(src2))' took 7 seconds

It should make a difference on embedded systems.
The test was performed on a i5 desktop CPU [~3.5 years of age].

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
7 years agojson_object: implement json_object_deep_copy()
Alexandru Ardelean [Fri, 16 Jun 2017 07:05:32 +0000 (10:05 +0300)]
json_object: implement json_object_deep_copy()

Because doing `json_tokener_parse(json_object_get_string(src))`
feels sloppy, dirty, and makes me want to cry at night
sometimes.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
7 years agoMerge pull request #363 from jvijtiuk/integer_addition
Eric Haszlakiewicz [Mon, 27 Nov 2017 14:06:39 +0000 (09:06 -0500)]
Merge pull request #363 from jvijtiuk/integer_addition

Issue #338, add json_object_add_int functions

7 years agoUpdate test_parse.expected to match the code.
Eric Haszlakiewicz [Mon, 27 Nov 2017 13:48:08 +0000 (08:48 -0500)]
Update test_parse.expected to match the code.

7 years agoRewrite the json_tokener_state_inf handling in json_tokener to be simpler, and avoid...
Eric Haszlakiewicz [Mon, 27 Nov 2017 05:20:11 +0000 (00:20 -0500)]
Rewrite the json_tokener_state_inf handling in json_tokener to be simpler, and avoid needless copying of the input into a temporary buffer.

7 years agoAdd a few more tests to the partial parse to cover bytes after "Infinity".
Eric Haszlakiewicz [Mon, 27 Nov 2017 05:18:55 +0000 (00:18 -0500)]
Add a few more tests to the partial parse to cover bytes after "Infinity".

7 years agoSave proper expected output for test_parse from the previous commit.
Eric Haszlakiewicz [Mon, 27 Nov 2017 05:08:59 +0000 (00:08 -0500)]
Save proper expected output for test_parse from the previous commit.

7 years agoFix parsing of "-Infinity" when the "-" and "Infinity" are split across multiple...
Eric Haszlakiewicz [Mon, 27 Nov 2017 05:04:33 +0000 (00:04 -0500)]
Fix parsing of "-Infinity" when the "-" and "Infinity" are split across multiple calls.
Add several additional test cases for partial parsing of infinity values.

7 years agoIssue #371: fix parsing of "-Infinity" (although in a somewhat different location...
Eric Haszlakiewicz [Mon, 27 Nov 2017 03:42:40 +0000 (22:42 -0500)]
Issue #371: fix parsing of "-Infinity" (although in a somewhat different location than PR#372 used), and add a case to test_parse to check for this.

7 years agoAdd a few extra cases to test_parse to show how trailing bytes are handled, especiall...
Eric Haszlakiewicz [Mon, 27 Nov 2017 03:34:43 +0000 (22:34 -0500)]
Add a few extra cases to test_parse to show how trailing bytes are handled, especially for parsing "Infinity".

7 years agoRewrite test_basic_parse() to factor out a single_basic_parse() to avoid lots of...
Eric Haszlakiewicz [Mon, 27 Nov 2017 03:31:48 +0000 (22:31 -0500)]
Rewrite test_basic_parse() to factor out a single_basic_parse() to avoid lots of duplicate boiler plate code.
Also, emit the input string in the output so it's easier to see what's going on.

7 years agoOn VS 2013 and newer, actually use strtoll instead of redefining it to _strtoi64.
Eric Haszlakiewicz [Sun, 26 Nov 2017 19:17:17 +0000 (14:17 -0500)]
On VS 2013 and newer, actually use strtoll instead of redefining it to _strtoi64.

7 years agoMerge pull request #373 from commodo/fix-appveyor-build
Eric Haszlakiewicz [Sun, 26 Nov 2017 19:08:53 +0000 (14:08 -0500)]
Merge pull request #373 from commodo/fix-appveyor-build

build: fix build on appveyor CI

7 years agoMerge pull request #381 from busterb/fix-makedist
Eric Haszlakiewicz [Sun, 26 Nov 2017 18:57:54 +0000 (13:57 -0500)]
Merge pull request #381 from busterb/fix-makedist

Fix makedist

7 years agoadd/remove missing distribution files
Brent Cook [Sun, 26 Nov 2017 14:29:45 +0000 (08:29 -0600)]
add/remove missing distribution files

7 years agoignore more autoconf goo
Brent Cook [Sun, 26 Nov 2017 14:26:18 +0000 (08:26 -0600)]
ignore more autoconf goo

7 years agojson_util: define `strtoll` as _strtoi64 for MSVC
Alexandru Ardelean [Tue, 7 Nov 2017 14:50:58 +0000 (16:50 +0200)]
json_util: define `strtoll` as _strtoi64 for MSVC

Got the idea from this blog post:
  http://www.enchantedage.com/node/231

Simple & concise stuff :)

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
7 years agostrerror_override: re-organize strerror_override.h
Alexandru Ardelean [Tue, 7 Nov 2017 14:21:52 +0000 (16:21 +0200)]
strerror_override: re-organize strerror_override.h

Always include <string.h> before _json_c_strerror() definition.
Should fix linker issues on MSVC.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
7 years agoRemove out of date win32 build information, and mention the need to use cmake there.
Eric Haszlakiewicz [Mon, 23 Oct 2017 02:46:05 +0000 (22:46 -0400)]
Remove out of date win32 build information, and mention the need to use cmake there.

7 years agoFix definition of NELEM in the tests.
Eric Haszlakiewicz [Mon, 23 Oct 2017 02:28:35 +0000 (22:28 -0400)]
Fix definition of NELEM in the tests.

7 years agoIssue #370: work around Clang-on-windows oddities by rearranging ifdefs.
Eric Haszlakiewicz [Mon, 23 Oct 2017 02:19:41 +0000 (22:19 -0400)]
Issue #370: work around Clang-on-windows oddities by rearranging ifdefs.

7 years agoIssue #369: note some useful settings when building for Android.
Eric Haszlakiewicz [Fri, 20 Oct 2017 03:30:51 +0000 (23:30 -0400)]
Issue #369: note some useful settings when building for Android.

7 years agoUse cmake to create the json-c.pc file, as suggested by PR#362.
Eric Haszlakiewicz [Mon, 9 Oct 2017 17:16:00 +0000 (13:16 -0400)]
Use cmake to create the json-c.pc file, as suggested by PR#362.

7 years agoIssue #173, follow up to using strtoll to allow this to work on older Windows environ...
Eric Haszlakiewicz [Wed, 4 Oct 2017 02:50:29 +0000 (22:50 -0400)]
Issue #173, follow up to using strtoll to allow this to work on older Windows environments: Use cmake to generate config.h from config.h.win32, including checking for strtoll with cmake, or fall back to _strtoi64 for older MSVC's.
Also, add a few missing files to the list of sources to build.

7 years agoThe new cmake-generated VS builds now generate a dynamic .dll instead of a .lib
Eric Haszlakiewicz [Mon, 18 Sep 2017 01:44:04 +0000 (21:44 -0400)]
The new cmake-generated VS builds now generate a dynamic .dll instead of a .lib

7 years agoFor appveyor builds, json_config.h is actually generated in the "include" directory.
Eric Haszlakiewicz [Mon, 18 Sep 2017 01:35:53 +0000 (21:35 -0400)]
For appveyor builds, json_config.h is actually generated in the "include" directory.

7 years agoSplit the list of cmake headers into public and private ones, and only install the...
Eric Haszlakiewicz [Mon, 18 Sep 2017 01:27:07 +0000 (21:27 -0400)]
Split the list of cmake headers into public and private ones, and only install the public ones.

7 years agoAdd a "cmake ." line to the appveyor build file to try to get it working again.
Eric Haszlakiewicz [Mon, 18 Sep 2017 01:25:49 +0000 (21:25 -0400)]
Add a "cmake ." line to the appveyor build file to try to get it working again.

7 years agoAdd json_object_add_int functions
Juraj Vijtiuk [Thu, 14 Sep 2017 12:05:33 +0000 (08:05 -0400)]
Add json_object_add_int functions

7 years agoMerge pull request #361 from schwehr/int64
Eric Haszlakiewicz [Tue, 12 Sep 2017 01:25:27 +0000 (21:25 -0400)]
Merge pull request #361 from schwehr/int64

Fix double to int cast overflow in json_object_get_int64.

7 years agoFix double to int cast overflow in json_object_get_int64.
Kurt Schwehr [Mon, 11 Sep 2017 14:23:00 +0000 (07:23 -0700)]
Fix double to int cast overflow in json_object_get_int64.

Found with autofuzz in GDAL

7 years agoMerge pull request #360 from jasonbking/master
Eric Haszlakiewicz [Fri, 8 Sep 2017 02:45:48 +0000 (22:45 -0400)]
Merge pull request #360 from jasonbking/master

Use strtoll() to parse ints

7 years agoIssue#353: attempt to fix or ignore a few -Wdocumentation messages from Clang.
Eric Haszlakiewicz [Fri, 8 Sep 2017 02:22:25 +0000 (22:22 -0400)]
Issue#353: attempt to fix or ignore a few -Wdocumentation messages from Clang.

7 years agoIssue#353: mark lh_abort as actually deprecated, not just in the docs.
Eric Haszlakiewicz [Fri, 8 Sep 2017 02:21:29 +0000 (22:21 -0400)]
Issue#353: mark lh_abort as actually deprecated, not just in the docs.

7 years agoAdd long long 64-bit check
Jason King [Fri, 8 Sep 2017 01:46:06 +0000 (01:46 +0000)]
Add long long 64-bit check

7 years agoUse strtoll to parse ints
Jason King [Thu, 7 Sep 2017 17:21:14 +0000 (17:21 +0000)]
Use strtoll to parse ints

7 years agoRemove the Visual Studio project files as they were out of date, and should now be...
Eric Haszlakiewicz [Thu, 7 Sep 2017 03:50:03 +0000 (23:50 -0400)]
Remove the Visual Studio project files as they were out of date, and should now be generated by using cmake.

7 years agoIssue #359: Use consistent spacing in CMakeLists.txt
Eric Haszlakiewicz [Thu, 7 Sep 2017 03:40:20 +0000 (23:40 -0400)]
Issue #359: Use consistent spacing in CMakeLists.txt

7 years agoIssue #359: Don't duplicate lh_get_hash, just omit the "inline" for VS2010.
Eric Haszlakiewicz [Thu, 7 Sep 2017 03:39:23 +0000 (23:39 -0400)]
Issue #359: Don't duplicate lh_get_hash, just omit the "inline" for VS2010.

7 years agoMerge pull request #359 from Haffon/api-0.12
Eric Haszlakiewicz [Thu, 7 Sep 2017 03:20:36 +0000 (23:20 -0400)]
Merge pull request #359 from Haffon/api-0.12

update CMakeLists.txt for compile with visual studio at least 2010

7 years agoset JSON_C_HEADERS full file name
Haffon [Thu, 7 Sep 2017 02:39:14 +0000 (10:39 +0800)]
set JSON_C_HEADERS full file name