Commit Graph

  • b366750e11 Merge pull request #239 from ploxiln/printbuf_empty Eric Haszlakiewicz 2016-07-16 13:49:08 -04:00
  • 868b20ce4e initialize null terminator of new printbuf Pierce Lopez 2016-07-16 00:30:31 -04:00
  • 2b255d0ebf Fix absolute paths in test_util_file that vary depending on where it is run. Eric Haszlakiewicz 2016-06-27 04:29:07 +00:00
  • b1d65b62db Issue #113: Add more files to EXTRA_DIST and a dist-hook to get distcheck to at least not fail. Eric Haszlakiewicz 2016-06-27 04:28:34 +00:00
  • 1071385896 Issue #113: add "new" files to appropriate variables in Makefile, and note the need to run "make distcheck" as part of the release process. Fix issues with the test script so it works under distcheck too. Eric Haszlakiewicz 2016-06-27 03:46:38 +00:00
  • 29005ef7b1 Merge pull request #238 from nagamalli9999/master Eric Haszlakiewicz 2016-06-26 23:09:42 -04:00
  • 29ef73f21d Issue #189: Eliminate use of MC_ERROR from json_util.c, and add a json_util_get_last_err() function to retrieve the error for those callers that care about it. Add tests and descriptions for the functions in json_util.c Eric Haszlakiewicz 2016-06-26 02:20:05 +00:00
  • 78cf6e63ff linkhash.h: removed redundant params from comments Eswar Yaganti 2016-06-25 23:05:41 +05:30
  • 5fb63a09f9 linkhash.c: optimised the table_free path Eswar Yaganti 2016-06-25 22:50:36 +05:30
  • 595891729e Issue #236: Add -Wcast-qual and fix casts to retain constness. To better distinguish between entry->k and entry->v being const within linkhash, but non-const outside, add lh_entry_v() and lh_entry_k() accessors. Make lh_entry->k const. Eric Haszlakiewicz 2016-06-11 18:18:46 +00:00
  • f285c0a2e5 Issue #175: disable the fast-and-loose code in hashlittle() when running with AddressSanitizer. Eric Haszlakiewicz 2016-06-08 03:24:59 +00:00
  • ae66b24369 Mention that we're aiming to follow RFC 7159 now. Cause README.md to show up in Doxygen output as the main page. Eric Haszlakiewicz 2016-06-08 02:36:13 +00:00
  • 40de3c67cd Merge pull request #232 from NeoRaider/size_t2 Eric Haszlakiewicz 2016-06-07 16:47:40 -04:00
  • d13cfe10f6 tests/tests1: fix printf format for size_t arguments Matthias Schiffer 2016-06-07 10:49:42 +02:00
  • b547ee0f35 Update the index page to point at the 0.12.1 release. Eric Haszlakiewicz 2016-06-07 04:16:05 +00:00
  • 17f306188f Add the 0.12.1 release docs to gh-pages. Eric Haszlakiewicz 2016-06-07 04:14:43 +00:00
  • a42caac805 Copy over note about the 0.12.1 release to the master branch. Eric Haszlakiewicz 2016-06-07 04:13:15 +00:00
  • acbcc062f9 Add doxygen-generated docs for the 0.12.1 release. json-c-0.12.1-20160607 Eric Haszlakiewicz 2016-06-07 04:05:03 +00:00
  • ef2240098d Update release version to 0.12.1 and generate configure script. Eric Haszlakiewicz 2016-06-07 03:37:31 +00:00
  • 0539191d18 Check the __GCC_HAVE_SYNC_COMPARE_AND_SWAP_{2,4,8} defines to decide whether to use __sync_val_compare_and_swap(), as described at https://gcc.gnu.org/onlinedocs/cpp/Common-Predefined-Macros.html Also, fix the types of the variables when building on Windows. Also, should address issue #214. Eric Haszlakiewicz 2016-06-07 03:26:46 +00:00
  • 1eb5a700f9 Merge pull request #230 from ebassi/master Eric Haszlakiewicz 2016-06-06 22:59:38 -04:00
  • e61eb409fd Merge pull request #233 from NeoRaider/size_t3 Eric Haszlakiewicz 2016-06-06 22:55:44 -04:00
  • ce7ad480f4 Merge pull request #234 from NeoRaider/userdata Eric Haszlakiewicz 2016-06-06 22:54:40 -04:00
  • 0e1a057449 Remove reference to svn.metaparadigm.com Michael Clark 2016-06-07 08:11:16 +12:00
  • f87e378d48 Add public API to get and set userdata Matthias Schiffer 2016-05-29 05:54:57 +02:00
  • c2b004ba0e Make default double serializer ignore userdata again Matthias Schiffer 2016-05-29 04:54:38 +02:00
  • 22fdcfc71a Include stddef.h in json_object.h Matthias Schiffer 2016-05-29 05:19:50 +02:00
  • 28c1ca1240 Use stdint.h to check for size_t size Emmanuele Bassi 2016-05-23 10:18:59 +01:00
  • 7ae5c3f7a6 Issue #142: un-deprecate json_object_object_get(), but note why you might want to use json_object_object_get_ex() instead. Eric Haszlakiewicz 2016-05-23 03:02:34 +00:00
  • 5e4e5f7d9d Issue #205: use _strdup instead of strdup on Windows. Eric Haszlakiewicz 2016-05-23 02:37:09 +00:00
  • f4ca1325ae Merge branch 'doctaweeks-fixes-for-upstream' Eric Haszlakiewicz 2016-05-23 02:12:51 +00:00
  • 996be85843 Fix a few places that needed adjustment for the size_t changes, including updating the range checks to use a calculated SIZE_T_MAX. Eric Haszlakiewicz 2016-05-23 02:10:58 +00:00
  • 9a2915ce66 Merge branch 'fixes-for-upstream' of https://github.com/doctaweeks/json-c into doctaweeks-fixes-for-upstream Eric Haszlakiewicz 2016-05-23 02:08:28 +00:00
  • b2c5969aff Merge pull request #193 from jplitza/master Eric Haszlakiewicz 2016-05-18 16:10:27 -04:00
  • 21dc5dc92b Export json_object_double_to_json_string() and use custom format string Jan-Philipp Litza 2016-05-06 16:12:44 +02:00
  • 2200ffa8b0 Fix code in docs for json_object_new_double_s() Jan-Philipp Litza 2016-05-06 16:12:19 +02:00
  • 3345b25962 Add tests for the json_object_array_del_idx() function. Eric Haszlakiewicz 2016-04-30 19:09:45 +00:00
  • 9edf2418e0 Merge branch 'Protovision-master' Eric Haszlakiewicz 2016-04-30 18:53:16 +00:00
  • 1fb87cd196 Merge branch 'master' of https://github.com/Protovision/json-c into Protovision-master Eric Haszlakiewicz 2016-04-30 18:52:47 +00:00
  • e3fb74942a Merge pull request #216 from Jehan/master Eric Haszlakiewicz 2016-04-30 14:45:16 -04:00
  • c6a97eb9ce Merge pull request #218 from sevan/patch-1 Eric Haszlakiewicz 2016-04-30 14:44:29 -04:00
  • 82bdbdba24 Merge pull request #219 from rouault/low_heap_robustness_fixes Eric Haszlakiewicz 2016-04-30 14:44:05 -04:00
  • 4e0c8b55fb Merge pull request #220 from hschaa/master Eric Haszlakiewicz 2016-04-30 14:42:16 -04:00
  • afa9f824e7 Merge pull request #222 from chenha0/master Eric Haszlakiewicz 2016-04-30 14:40:30 -04:00
  • 02a2151b2b Merge pull request #223 from minaguib/master Eric Haszlakiewicz 2016-04-30 14:36:02 -04:00
  • 138c2a6b97 Clarify json_object_get_string documentation of NULL handling & returning Mina Naguib 2016-02-07 20:55:25 -05:00
  • dffdee966f Fix issue #221: JSON_C_TO_STRING_NOSLASHESCAPE works incorrectly chenha0 2016-01-21 20:11:40 +08:00
  • dec5fcd50b Add some basic tests for verifying json_object_equal behavior Helmut Schaa 2016-01-13 15:40:08 +01:00
  • 00e475c434 Add utility function for comparing json_objects Helmut Schaa 2016-01-13 15:40:02 +01:00
  • 77a4276a8c Fix various potential null ptr deref and int32 overflows Even Rouault 2016-01-11 12:15:54 +01:00
  • 7150b7f28d Use a macro to indicate C99 to the compiler Sevan Janiyan 2016-01-05 11:43:17 +00:00
  • 79c99aeb2b configure: check realloc with AC_CHECK_FUNCS() to fix cross-compilation. Jehan 2016-01-01 18:35:14 +01:00
  • 537f8bcbdb Add const qualifiers to several functions that don't modify the json_object. Eric Haszlakiewicz 2015-12-26 21:42:18 +00:00
  • 882b7d95cc Issue #137: remove config.h.in from change control. Eric Haszlakiewicz 2015-12-08 21:20:42 -06:00
  • 980cdd61be Merge commit '2be921d88376e78f84d79aafa6db2714da804e59' Eric Haszlakiewicz 2015-12-08 20:51:06 -06:00
  • 65be8275da Merge pull request #209 from rgerhards/fix-regression Eric Haszlakiewicz 2015-11-29 21:24:50 -05:00
  • 316da85818 Fix issue #201: add a JSON_C_TO_STRING_NOSLASHESCAPE flag to turn off escaping of forward slashes. Eric Haszlakiewicz 2015-11-28 20:00:30 -06:00
  • 5a6a378725 Merge pull request #198 from unmole/master Eric Haszlakiewicz 2015-11-28 13:58:07 -05:00
  • 7e98ed93f4 subtract first, then retrieve value Emiel Bruijntjes 2015-11-28 14:19:43 +01:00
  • 9d85367679 added tabs instead of spaces to be compatible with rest of code Emiel Bruijntjes 2015-11-27 16:53:57 +01:00
  • 827f0fd8ef update indentation Emiel Bruijntjes 2015-11-27 16:52:17 +01:00
  • 23ee243113 reference increment and decrement is now atomic (when using a GCC compatible compiler), which allows passing json objects between threads Emiel Bruijntjes 2015-11-27 16:49:32 +01:00
  • 92e9a5032b Use size_t for json object array ops Daniel M. Weeks 2014-08-22 12:16:45 -04:00
  • 45c56b80c4 Use size_t for array list length and size Daniel M. Weeks 2014-08-22 10:56:59 -04:00
  • 36610fb697 fix regression from 2d549662be Rainer Gerhards 2015-11-19 11:05:15 +01:00
  • c97bbd3797 Merge pull request #199 from Nzbuu/fix_vs_build Eric Haszlakiewicz 2015-11-14 23:31:15 -05:00
  • b82a51a5cd Merge pull request #200 from Nzbuu/ci_build Eric Haszlakiewicz 2015-11-14 23:30:38 -05:00
  • 239c146a4b Appveyor: Visual Studio v140 no longer fails James Myatt 2015-11-05 13:50:30 +00:00
  • fd43c2b99a Appveyor: Create artefact with library and include files only James Myatt 2015-11-05 13:41:42 +00:00
  • 80c1f69b9e Use AX_APPEND_COMPILE_FLAGS() to check the various compile flags, such as -Wall, to ensure the compile supports. Eric Haszlakiewicz 2015-10-23 02:16:40 +00:00
  • 10d50aadf2 Remove the AC_FUNC_MALLOC check, since we don't depend on the malloc(0) behavior it checks for, and we don't provide a rpl_malloc() implementation anyway. Eric Haszlakiewicz 2015-10-22 02:57:13 +00:00
  • 82030cd0af Travis: add osx and clang builds James Myatt 2015-10-09 23:50:51 +01:00
  • 88dedb8824 Travis: skip install step James Myatt 2015-10-09 23:48:06 +01:00
  • f786feac0a Add Travis build script James Myatt 2015-10-09 23:46:19 +01:00
  • 17e11e2c92 Appveyor: Allow failing builds against newest toolset James Myatt 2015-09-11 13:03:36 +01:00
  • f6f8436e97 Add initial version of Appveyor build script James Myatt 2015-09-11 12:20:44 +01:00
  • 3f012eb0f8 Fix build in Visual Studio James Myatt 2015-10-09 23:24:55 +01:00
  • 467102fa78 Remove superfluous NULL checks Anmol Sarma 2015-10-01 14:14:03 +05:30
  • f37b0a10a5 Fix possible memory leak Anmol Sarma 2015-10-01 14:09:09 +05:30
  • 12916e229c Merge pull request #196 from rgerhards/improve-performance Eric Haszlakiewicz 2015-09-28 22:25:29 -04:00
  • c4f8cc34df more efficient handling for smalls strings inside json_object Rainer Gerhards 2015-09-23 15:56:48 +02:00
  • 1ae4b50bde remove unneeded data items from hashtable code Rainer Gerhards 2015-09-23 12:40:57 +02:00
  • 8f8d03df46 add perllike hash function for strings Rainer Gerhards 2015-09-23 11:12:13 +02:00
  • 2d549662be add json_object_object_add_ex() API Rainer Gerhards 2015-09-23 09:08:49 +02:00
  • d8e44dc685 reduce duplicate hash computation in json_object_object_add() Rainer Gerhards 2015-09-22 19:07:30 +02:00
  • 1757a31750 Fix doc for json_object_new_boolean() to indicate the correct value for TRUE (1). Eric Haszlakiewicz 2015-08-23 00:08:14 -04:00
  • d4f8f92eb0 Squash deprecated function warning by replacing json_object_object_get calls with json_object_object_get_ex in test_cast. Eric Haszlakiewicz 2015-08-23 00:06:36 -04:00
  • 93b1fe63e5 Add back in the __attribute__((__unused__)) that was lost in the previous commit. It's needed to squash a "variable 'val' set but not used" warning. Eric Haszlakiewicz 2015-08-22 23:59:49 -04:00
  • a8bbefbbb4 Merge pull request #183 from cryogen/master Eric Haszlakiewicz 2015-08-22 15:24:26 -04:00
  • 55530bfc0f Merge pull request #186 from Virtual-Instruments/master Eric Haszlakiewicz 2015-08-05 23:19:19 -04:00
  • e8a302017f Syntax error Jacob Alexander 2015-06-02 13:59:50 -07:00
  • b594c34f57 Merge pull request #174 from haata/master Eric Haszlakiewicz 2015-05-31 12:10:13 -07:00
  • 92d4cf15f0 Adding JSON_C_TO_STRING_PRETTY_TAB flag Jacob Alexander 2015-03-23 16:34:30 -07:00
  • cd8bd7f617 Tell the compiler we're intentionally ignoring the return value from __sync_val_compare_and_swap(). Eric Haszlakiewicz 2015-05-26 19:02:19 -07:00
  • 75d7409c4e Fix uninitialised variable compile warning, and also fix unused-when-used warning Stuart Walsh 2015-03-31 12:23:03 +01:00
  • cbedf2f7ca Merge pull request #149 from cicku/patch-2 Eric Haszlakiewicz 2015-05-09 21:35:22 -04:00
  • e4fce5d6ae Merge pull request #171 from Nzbuu/vs2010_build Eric Haszlakiewicz 2015-05-08 21:31:37 -04:00
  • 8ba19375d5 Merge pull request #177 from cryogen/json-c-0.12 Eric Haszlakiewicz 2015-05-08 21:20:54 -04:00
  • e1eb298de1 Merge pull request #182 from tpetazzoni/libm-fix Eric Haszlakiewicz 2015-05-08 21:19:48 -04:00
  • 82a1316f76 Merge pull request #180 from yegorich/silent Eric Haszlakiewicz 2015-05-08 21:19:05 -04:00