Commit Graph

  • 7a9075c16b Added test cases for spaced pretty and pretty_tab used together Darjan Krijan 2018-12-07 17:30:15 +01:00
  • 240627f260 Merge pull request #454 from ramiropolla/json_object_private Eric Haszlakiewicz 2018-11-30 09:49:35 -05:00
  • 745cadc944 Merge pull request #461 from andy5995/issue_422 Eric Haszlakiewicz 2018-11-28 20:39:42 -05:00
  • 83cb93b7ae Merge pull request #462 from andy5995/issue_460 Eric Haszlakiewicz 2018-11-28 20:39:13 -05:00
  • 2942870325 remove [in] from params description andy5995 2018-11-28 16:55:19 -06:00
  • 3b108935d0 json_object.h:document json_object_new_string_len() andy5995 2018-11-27 11:35:45 -06:00
  • 506a32d4ab json_object.c:set errno in json_object_get_double() andy5995 2018-11-26 21:12:06 -06:00
  • 7539ab2d2e Merge pull request #459 from andy5995/issue_438 Eric Haszlakiewicz 2018-11-25 21:19:02 -05:00
  • 753de5a5a9 Merge pull request #458 from andy5995/README_files_link Eric Haszlakiewicz 2018-11-25 21:17:40 -05:00
  • 80bf857b27 Merge pull request #457 from andy5995/gitignore_build Eric Haszlakiewicz 2018-11-25 21:14:34 -05:00
  • aa831c7960 Merge pull request #456 from andy5995/style_perms Eric Haszlakiewicz 2018-11-25 21:14:14 -05:00
  • 133152a08f Merge pull request #455 from andy5995/test2_dead Eric Haszlakiewicz 2018-11-25 21:13:52 -05:00
  • fc1b113b29 README.html:fix link to Doxygen docs, remove WIN32 link andy5995 2018-11-25 07:09:00 -06:00
  • 71f5c2d50b README.md:fix dead "file.html" link andy5995 2018-11-25 06:51:21 -06:00
  • c3e11d6812 .gitignore:add build directory andy5995 2018-11-25 06:45:21 -06:00
  • dba65cbd30 STYLE.txt:remove executable permissions andy5995 2018-11-25 06:43:02 -06:00
  • 80fd381f8f index.html:fix dead link andy5995 2018-11-25 06:11:00 -06:00
  • 5bb5e2e8fc json_object_private: save 8 bytes in struct json_object in 64-bit architectures Ramiro Polla 2018-11-24 03:36:51 +01:00
  • b0bceaa8bf Added a test for the space after \n issue with flags=JSON_C_TO_STRING_SPACED|JSON_C_TO_STRING_PRETTY|(JSON_C_TO_STRING_PRETTY_TAB) used in json_object_array_to_json_string Darjan Krijan 2018-11-21 22:41:13 +01:00
  • 3943960874 Removed spaces after \n for arrays as well Darjan Krijan 2018-11-21 22:34:01 +01:00
  • e8cec5c9e4 Fixed misalignment in JSON string due to space after \n being printed when choosing JSON_C_TO_STRING_SPACED together with JSON_C_TO_STRING_PRETTY in json_object_array_to_json_string Darjan Krijan 2018-11-20 22:21:27 +01:00
  • ebe520e96e Merge pull request #450 from drizt/subproject Eric Haszlakiewicz 2018-10-20 23:01:20 -04:00
  • ba5a02e8a9 Allow use json-c cmake as subproject Ivan Romanov 2018-10-20 10:50:15 +05:00
  • 994e6c1f60 Re-add creation and installation of the json-c.pc file to the cmake build. Eric Haszlakiewicz 2018-09-01 15:06:14 -04:00
  • 705e2fd010 Merge pull request #444 from Hawk777/document-ref-count-tokener Eric Haszlakiewicz 2018-08-31 01:16:53 -04:00
  • 31d4d3dee7 Document refcount of json_tokener_parse_ex return Christopher Head 2018-08-30 09:18:29 -07:00
  • 0a8ac2ed92 Merge pull request #441 from changyongGuo/c_flag_error Eric Haszlakiewicz 2018-08-14 20:40:49 -04:00
  • 08c8231cc8 fix c flag loss during cmake building changyong guo 2018-08-14 13:52:18 +08:00
  • bf29aa0f8c Merge pull request #434 from unmanned-player/devel Eric Haszlakiewicz 2018-07-28 11:59:46 -04:00
  • 91f9884591 Merge pull request #436 from jobol/master Eric Haszlakiewicz 2018-07-26 23:28:42 -04:00
  • d189d7b5ff Improve pkgconfig setting Jose Bollo 2018-07-25 15:45:01 +02:00
  • f2e991a341 The real CMake support Unmanned Player 2018-07-24 08:06:13 +10:00
  • 2327b23d8e Merge pull request #431 from LeSpocky/cmake Eric Haszlakiewicz 2018-07-12 22:26:48 -04:00
  • 901d59b29f cmake: Bump required version Alexander Dahl 2018-07-12 21:25:38 +02:00
  • 3df1f98b4a Explain why we're not setting the output name for static libraries when on Windows. Eric Haszlakiewicz 2018-06-23 22:10:55 -04:00
  • a056893263 Merge pull request #415 from sgbihu/master Eric Haszlakiewicz 2018-06-23 22:08:25 -04:00
  • e3752b5894 Issue #418: Fix docs for json_util_from_fd and json_util_from_file to say that they return NULL on failures. Eric Haszlakiewicz 2018-06-14 22:24:15 -04:00
  • c1c71097a1 Issue #419: document that NULL may be passed to json_object_put(). Eric Haszlakiewicz 2018-06-12 23:16:31 -04:00
  • fb042f449b Merge pull request #421 from lt-holman/install_header_file Eric Haszlakiewicz 2018-06-08 23:45:47 -04:00
  • 37a2edf468 install json_object_iterator.h header file Keith Holman 2018-06-07 13:19:27 -04:00
  • 4bbc72f633 Merge pull request #420 from angelskieglazki/master Eric Haszlakiewicz 2018-06-02 23:01:04 -04:00
  • 7a4759f165 arraylist: Fix names of parameters for callback function max 2018-06-01 18:21:06 +03:00
  • 4414d068b3 Always create debug info (pdb file) even for release builds. Eric Haszlakiewicz 2018-05-27 21:50:57 -04:00
  • 7038bb8061 Try the appveyor changes again, using %Configuration% instead of "Debug" Eric Haszlakiewicz 2018-05-27 18:20:32 -04:00
  • dfc0fddf22 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. Eric Haszlakiewicz 2018-05-27 16:07:11 -04:00
  • 0b3616d580 Resolve windows name conflict Liang, Gao 2018-05-21 16:28:06 +08:00
  • c75ebe8973 Merge pull request #410 from janczer/fix-typos Eric Haszlakiewicz 2018-04-24 22:01:09 -04:00
  • 8bd62177e7 Fixed typos janczer 2018-04-24 16:00:38 +02:00
  • f8c632f579 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. Eric Haszlakiewicz 2018-03-25 18:25:58 -04:00
  • da4b34355d Add an parse test for content starting with a UTF8 BOM, which is _not_ a valid start to a JSON message. Eric Haszlakiewicz 2018-03-25 18:23:42 -04:00
  • 55ca228981 Update the doc links to point at 0.13.1 Eric Haszlakiewicz 2018-03-05 23:32:27 -05:00
  • 637ef3e1b5 Add the 0.13.1 docs. Eric Haszlakiewicz 2018-03-05 23:31:09 -05:00
  • 985c46fec3 Update docs for the 0.13.1 release. json-c-0.13.1-20180305 Eric Haszlakiewicz 2018-03-05 23:18:59 -05:00
  • 991e128df5 Bump version to 0.13.1, and re-generate autoconf and automake files. Eric Haszlakiewicz 2018-03-05 23:16:43 -05:00
  • 914527d091 Eliminate ACLOCAL_AMFLAGS, since it changes how libtool files are generated too significantly. Eric Haszlakiewicz 2018-03-05 23:14:57 -05:00
  • 861c1a8286 Update the change log for the 0.13.1 release. Eric Haszlakiewicz 2018-03-05 22:54:57 -05:00
  • 104aef0a6e Update the change log for the 0.13.1 release. Eric Haszlakiewicz 2018-03-05 22:54:57 -05:00
  • 0f814e52dd Issue #396: check for toolchain compatibilty with _REENTRANT before adding it to CFLAGS. Eric Haszlakiewicz 2018-03-04 22:32:45 -05:00
  • 33e166a685 pull in fuzzers, add CI scripts later Chris Wolfe 2018-02-05 19:24:51 -06:00
  • d222b13758 Avoid uninitialized variable warnings Jonathan Wiens 2018-01-17 15:57:52 +01:00
  • 2fd95844c3 Issue #396: check for toolchain compatibilty with _REENTRANT before adding it to CFLAGS. Eric Haszlakiewicz 2018-03-04 22:32:45 -05:00
  • 1e301d94be Merge pull request #402 from derwolfe/fuzz Eric Haszlakiewicz 2018-02-19 13:54:18 -05:00
  • 1e08150838 pull in fuzzers, add CI scripts later Chris Wolfe 2018-02-05 19:24:51 -06:00
  • f8eb1dec64 Merge pull request #399 from jonathan-wiens/bugfix/initialize_variable Eric Haszlakiewicz 2018-01-26 23:46:33 -05:00
  • cdc4e9f64b Avoid uninitialized variable warnings Jonathan Wiens 2018-01-17 15:57:52 +01:00
  • 4d814600d7 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. Eric Haszlakiewicz 2018-01-15 23:31:55 -05:00
  • 250de31f17 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. Eric Haszlakiewicz 2018-01-15 23:31:55 -05:00
  • a70466ebbf PR#394: fix breakage with VS build. Eric Haszlakiewicz 2017-12-24 14:42:58 -05:00
  • 8270e83552 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). Eric Haszlakiewicz 2017-12-24 13:45:52 -05:00
  • c652b6ad29 PR#394: fix breakage with VS build. Eric Haszlakiewicz 2017-12-24 14:42:58 -05:00
  • d5da847f51 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). Eric Haszlakiewicz 2017-12-24 13:45:52 -05:00
  • 0992aac61f Remove the TRUE and FALSE defines. Eric Haszlakiewicz 2017-12-23 09:42:17 -05:00
  • cfd09c87f0 Merge pull request #393 from besser82/enhancement/unsigned_refcount Eric Haszlakiewicz 2017-12-17 09:52:27 -05:00
  • c233f5c05e json_object_private: Use unsigned 32-bit integer type for refcount Björn Esser 2017-12-16 17:09:39 +01:00
  • eb55c83600 Merge pull request #392 from besser82/json-c-0.13 Eric Haszlakiewicz 2017-12-14 17:25:53 -05:00
  • 3e89278476 Makefile: Add ACLOCAL_AMFLAGS Björn Esser 2017-12-10 16:29:41 +01:00
  • 99ea93338d json_object: Avoid invalid free (and thus a segfault) when ref_count gets < 0 Björn Esser 2017-12-13 19:22:52 +01:00
  • 5ea6a05bfa Merge pull request #389 from besser82/bugfix/invalid_free Eric Haszlakiewicz 2017-12-14 09:28:06 -05:00
  • 9aca3b6a08 json_object: Avoid invalid free (and thus a segfault) when ref_count gets < 0 Björn Esser 2017-12-13 19:22:52 +01:00
  • b5a3eff582 Fix non-GNUC define for JSON_C_CONST_FUNCTION Rikard Falkeborn 2017-12-13 22:24:50 +01:00
  • 1882e3c425 Merge pull request #390 from besser82/json-c-0.13 Eric Haszlakiewicz 2017-12-13 22:03:51 -05:00
  • 8c214902d9 Merge pull request #386 from besser82/bugfix/aclocal_amflags Eric Haszlakiewicz 2017-12-13 22:03:20 -05:00
  • e411b1a36e Merge pull request #391 from rikardfalkeborn/fix-const-function-define Eric Haszlakiewicz 2017-12-13 21:51:13 -05:00
  • 84dcc01da1 Fix non-GNUC define for JSON_C_CONST_FUNCTION Rikard Falkeborn 2017-12-13 22:24:50 +01:00
  • 8baf437817 Apply gcc's "const" attribute to the json_c_object_sizeof() function as an optimizer hint. Also, rename that function from json_object_sizeof(). Eric Haszlakiewicz 2017-12-12 18:26:51 -05:00
  • 10fe00650c json_object: Add size_t json_object_sizeof() Björn Esser 2017-12-11 12:55:40 +01:00
  • 87556afe2a Makefile: Add ACLOCAL_AMFLAGS Björn Esser 2017-12-10 16:29:41 +01:00
  • 5b6d62259a Apply gcc's "const" attribute to the json_c_object_sizeof() function as an optimizer hint. Also, rename that function from json_object_sizeof(). Eric Haszlakiewicz 2017-12-12 18:26:51 -05:00
  • 94fd101601 Merge pull request #388 from besser82/enhancement/json_object_sizeof Eric Haszlakiewicz 2017-12-12 18:14:40 -05:00
  • 25afa92ed5 Merge pull request #387 from LeSpocky/doc Eric Haszlakiewicz 2017-12-12 09:13:36 -05:00
  • c123a1c21b json_object: Add size_t json_object_sizeof() Björn Esser 2017-12-11 12:55:40 +01:00
  • 89747ac758 doc: Use other doxygen feature to specify mainpage Alexander Dahl 2017-12-11 09:46:28 +01:00
  • a19031411d Remove the previously deprecated lh_table_lookup() function, in favor of lh_table_lookup_ex(). Eric Haszlakiewicz 2017-12-10 00:27:01 -05:00
  • f83cf244cd Remove the previously deprecated bits.h and the lh_abort() function. Eric Haszlakiewicz 2017-12-10 00:25:00 -05:00
  • 963e707ca4 Drop mention of README-WIN32.html in the release checklist. Eric Haszlakiewicz 2017-12-09 15:12:08 -05:00
  • c1ed91df8c Update the index page to refer to 0.13 as the current release. Eric Haszlakiewicz 2017-12-09 15:10:46 -05:00
  • 77e94c9a3d Add the docs from the 0.13 release to gh-pages. Eric Haszlakiewicz 2017-12-09 15:05:48 -05:00
  • 0631c37c7f Update the master branch to version 0.13.99 Eric Haszlakiewicz 2017-12-09 14:59:48 -05:00
  • 8c4a941475 Tweak the release checklist slightly to fix problems noticed during this past release process. Eric Haszlakiewicz 2017-12-09 14:59:05 -05:00
  • 2849650f11 Regenerate Makefile.in with private headers excluded from install. json-c-0.13-20171207 Eric Haszlakiewicz 2017-12-07 18:28:34 -05:00