Commit Graph

  • *
  • |\
  • * \
  • |\ \
  • * | |
  • * | |
  • |\ \ \
  • | | | | *
  • | | | | *
  • | | | | *
  • | | | | *
  • | |_|_|/
  • |/| | |
  • | | | | *
  • | | | | *
  • | |_|_|/
  • |/| | |
  • | | * |
  • | |/ /
  • |/| |
  • | | | *
  • | |_|/|
  • |/| | |
  • | | | *
  • | | | *
  • | | | *
  • | | | *
  • | | | *
  • | | | *
  • | | | *
  • | | | *
  • | | | *
  • | |_|/
  • |/| |
  • * | |
  • |\ \ \
  • * \ \ \
  • |\ \ \ \
  • | * | | |
  • | * | | |
  • * | | | |
  • * | | | |
  • | * | | |
  • | * | | |
  • | * | | |
  • | * | | |
  • | * | | |
  • |/ / / /
  • | * / /
  • |/ / /
  • | | | *
  • | |_|/|
  • |/| | |
  • | * | |
  • | * | |
  • |/ / /
  • * | |
  • |\ \ \
  • | * | |
  • | * | |
  • | * | |
  • | * | |
  • | * | |
  • | | * |
  • | |/ /
  • |/| |
  • * | |
  • * | |
  • * | |
  • * | |
  • |\ \ \
  • | | | | *
  • | |_|_|/
  • |/| | |
  • * | | |
  • |\ \ \ \
  • | * | | |
  • |/ / / /
  • * | | |
  • |\ \ \ \
  • | * | | |
  • * | | | |
  • | | | | *
  • | | | | *
  • | |_|_|/
  • |/| | |
  • | | * |
  • | |/ /
  • |/| |
  • * | |
  • |\ \ \
  • * \ \ \
  • |\ \ \ \
  • | | | | | *
  • | | | | | |\
  • * | | | | | \
  • |\ \ \ \ \ \ \
  • * \ \ \ \ \ \ \
  • |\ \ \ \ \ \ \ \
  • | |_|_|_|/ / / /
  • |/| | | | | | |
  • | | * | | | | |
  • | |/ / / / / /
  • |/| | | | | |
  • | * | | | | |
  • |/ / / / / /
  • | | | | | | *
  • | |_|_|_|_|/
  • |/| | | | |
  • | | | | | *
  • | | | | |/
  • | * | | |
  • | * | | |
  • | * | | |
  • | * | | |
  • | * | | |
  • | * | | |
  • | * | | |
  • | * | | |
  • | * | | |
  • | * | | |
  • | * | | |
  • |/ / / /
  • * | | |
  • |\ \ \ \
  • * \ \ \ \
  • |\ \ \ \ \
  • | | | | | | *
  • | |_|_|_|_|/|
  • |/| | | | | |
  • * | | | | | |
  • |\ \ \ \ \ \ \
  • * | | | | | | |
  • * | | | | | | |
  • |\ \ \ \ \ \ \ \
  • | | | | | | | | | *
  • | |_|_|_|_|_|_|_|/|
  • |/| | | | | | | | |
  • * | | | | | | | | |
  • |\ \ \ \ \ \ \ \ \ \
  • | |_|_|_|_|_|/ / / /
  • |/| | | | | | | | |
  • | | | | | * | | | |
  • | |_|_|_|/ / / / /
  • |/| | | | | | | |
  • | | | | * | | | |
  • | | | | * | | | |
  • | |_|_|/ / / / /
  • |/| | | | | | |
  • | | | | | | | | *
  • | |_|_|_|_|_|_|/|
  • |/| | | | | | | |
  • | | | | | | | | *
  • | |_|_|_|_|_|_|/
  • |/| | | | | | |
  • | | | | | | * |
  • | |_|_|_|_|/ /
  • |/| | | | | |
  • * | | | | | |
  • |\ \ \ \ \ \ \
  • * \ \ \ \ \ \ \
  • |\ \ \ \ \ \ \ \
  • * \ \ \ \ \ \ \ \
  • |\ \ \ \ \ \ \ \ \
  • * \ \ \ \ \ \ \ \ \
  • |\ \ \ \ \ \ \ \ \ \
  • | | | | | * | | | | |
  • | |_|_|_|/ / / / / /
  • |/| | | | | | | | |
  • | | | | | * | | | |
  • | |_|_|_|/ / / / /
  • |/| | | | | | | |
  • | | | | * | | | |
  • | |_|_|/ / / / /
  • |/| | | | | | |
  • | | | * | | | |
  • | |_|/ / / / /
  • |/| | | | | |
  • | | * | | | |
  • | |/ / / / /
  • |/| | | | |
  • | | | * | |
  • | |_|/ / /
  • |/| | | |
  • 40df071 (refs/pull/194/merge) Merge 1a8041c503 into 65be8275da by hschaa 2015-11-30 09:03:35 +0000
  • 65be827 Merge pull request #209 from rgerhards/fix-regression by Eric Haszlakiewicz 2015-11-29 21:24:50 -0500
  • 316da85 Fix issue #201: add a JSON_C_TO_STRING_NOSLASHESCAPE flag to turn off escaping of forward slashes. by Eric Haszlakiewicz 2015-11-28 20:00:30 -0600
  • 5a6a378 Merge pull request #198 from unmole/master by Eric Haszlakiewicz 2015-11-28 13:58:07 -0500
  • 7e98ed9 (refs/pull/211/head) subtract first, then retrieve value by Emiel Bruijntjes 2015-11-28 14:19:43 +0100
  • 9d85367 added tabs instead of spaces to be compatible with rest of code by Emiel Bruijntjes 2015-11-27 16:53:57 +0100
  • 827f0fd update indentation by Emiel Bruijntjes 2015-11-27 16:52:17 +0100
  • 23ee243 reference increment and decrement is now atomic (when using a GCC compatible compiler), which allows passing json objects between threads by Emiel Bruijntjes 2015-11-27 16:49:32 +0100
  • 92e9a50 (refs/pull/210/head) Use size_t for json object array ops by Daniel M. Weeks 2014-08-22 12:16:45 -0400
  • 45c56b8 Use size_t for array list length and size by Daniel M. Weeks 2014-08-22 10:56:59 -0400
  • 36610fb (refs/pull/209/head) fix regression from 2d549662be by Rainer Gerhards 2015-11-19 11:05:15 +0100
  • faecc37 (refs/pull/208/merge) Merge b328d7229d into c97bbd3797 by Rainer Gerhards 2015-11-18 12:15:59 +0000
  • b328d72 (refs/pull/208/head) do not break API compatibility by Rainer Gerhards 2015-11-18 13:05:39 +0100
  • 222e360 API enhancement: permit to set initial printbuf size by Rainer Gerhards 2015-11-18 12:22:34 +0100
  • fa807c6 refactor string escaping function by Rainer Gerhards 2015-11-18 09:05:11 +0100
  • 59b7583 notably improve performance of string escape function by Rainer Gerhards 2015-11-18 08:44:44 +0100
  • 4969ffd new out-of-memory handling for json_object_to_json_string by Rainer Gerhards 2015-11-17 16:03:28 +0100
  • fd09c66 avoid writing unnecessary terminator bytes in json_object_to_json_string by Rainer Gerhards 2015-11-17 15:45:52 +0100
  • 6a6278c printbuf: append single-byte values directly by Rainer Gerhards 2015-11-17 14:56:17 +0100
  • cccfaf4 very slight but noticable performance improvement by Rainer Gerhards 2015-11-17 14:38:44 +0100
  • 7e74a01 greatly enhance performance of json_object_object_to_json_string() by Rainer Gerhards 2015-11-17 12:19:32 +0100
  • c97bbd3 Merge pull request #199 from Nzbuu/fix_vs_build by Eric Haszlakiewicz 2015-11-14 23:31:15 -0500
  • b82a51a Merge pull request #200 from Nzbuu/ci_build by Eric Haszlakiewicz 2015-11-14 23:30:38 -0500
  • 239c146 (refs/pull/200/head) Appveyor: Visual Studio v140 no longer fails by James Myatt 2015-11-05 13:50:30 +0000
  • fd43c2b Appveyor: Create artefact with library and include files only by James Myatt 2015-11-05 13:41:42 +0000
  • 80c1f69 Use AX_APPEND_COMPILE_FLAGS() to check the various compile flags, such as -Wall, to ensure the compile supports. by Eric Haszlakiewicz 2015-10-23 02:16:40 +0000
  • 10d50aa 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. by Eric Haszlakiewicz 2015-10-22 02:57:13 +0000
  • 82030cd Travis: add osx and clang builds by James Myatt 2015-10-09 23:50:51 +0100
  • 88dedb8 Travis: skip install step by James Myatt 2015-10-09 23:48:06 +0100
  • f786fea Add Travis build script by James Myatt 2015-10-09 23:46:19 +0100
  • 17e11e2 Appveyor: Allow failing builds against newest toolset by James Myatt 2015-09-11 13:03:36 +0100
  • f6f8436 Add initial version of Appveyor build script by James Myatt 2015-09-11 12:20:44 +0100
  • 3f012eb (refs/pull/199/head) Fix build in Visual Studio by James Myatt 2015-10-09 23:24:55 +0100
  • 6e21b7b (refs/pull/184/merge) Merge 3f0a36362d into 12916e229c by Dagobert Michelsen 2015-10-02 14:39:12 +0000
  • 467102f (refs/pull/198/head) Remove superfluous NULL checks by Anmol Sarma 2015-10-01 14:14:03 +0530
  • f37b0a1 Fix possible memory leak by Anmol Sarma 2015-10-01 14:09:09 +0530
  • 12916e2 Merge pull request #196 from rgerhards/improve-performance by Eric Haszlakiewicz 2015-09-28 22:25:29 -0400
  • c4f8cc3 (refs/pull/196/head) more efficient handling for smalls strings inside json_object by Rainer Gerhards 2015-09-23 15:56:48 +0200
  • 1ae4b50 remove unneeded data items from hashtable code by Rainer Gerhards 2015-09-23 12:40:57 +0200
  • 8f8d03d add perllike hash function for strings by Rainer Gerhards 2015-09-23 11:12:13 +0200
  • 2d54966 add json_object_object_add_ex() API by Rainer Gerhards 2015-09-23 09:08:49 +0200
  • d8e44dc reduce duplicate hash computation in json_object_object_add() by Rainer Gerhards 2015-09-22 19:07:30 +0200
  • 1a8041c (refs/pull/194/head) Add utility function for comparing json_objects by Helmut Schaa 2015-09-08 12:41:58 +0200
  • 1757a31 Fix doc for json_object_new_boolean() to indicate the correct value for TRUE (1). by Eric Haszlakiewicz 2015-08-23 00:08:14 -0400
  • d4f8f92 Squash deprecated function warning by replacing json_object_object_get calls with json_object_object_get_ex in test_cast. by Eric Haszlakiewicz 2015-08-23 00:06:36 -0400
  • 93b1fe6 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. by Eric Haszlakiewicz 2015-08-22 23:59:49 -0400
  • a8bbefb Merge pull request #183 from cryogen/master by Eric Haszlakiewicz 2015-08-22 15:24:26 -0400
  • 43a44b9 (refs/pull/191/head) Override int64 to only display uint64 strings by Jacob Alexander 2015-08-20 18:18:51 -0700
  • 55530bf Merge pull request #186 from Virtual-Instruments/master by Eric Haszlakiewicz 2015-08-05 23:19:19 -0400
  • e8a3020 (refs/pull/186/head) Syntax error by Jacob Alexander 2015-06-02 13:59:50 -0700
  • b594c34 Merge pull request #174 from haata/master by Eric Haszlakiewicz 2015-05-31 12:10:13 -0700
  • 92d4cf1 (refs/pull/174/head) Adding JSON_C_TO_STRING_PRETTY_TAB flag by Jacob Alexander 2015-03-23 16:34:30 -0700
  • cd8bd7f Tell the compiler we're intentionally ignoring the return value from __sync_val_compare_and_swap(). by Eric Haszlakiewicz 2015-05-26 19:02:19 -0700
  • 3f0a363 (refs/pull/184/head) Use GCC flags only when compiling with GCC by Dagobert Michelsen 2015-05-20 11:22:42 +0200
  • f569cf4 Solaris does not allow POSIX-compliant evaluation in sh by Dagobert Michelsen 2015-05-20 11:08:48 +0200
  • 75d7409 (refs/pull/183/head) Fix uninitialised variable compile warning, and also fix unused-when-used warning by Stuart Walsh 2015-03-31 12:23:03 +0100
  • cbedf2f Merge pull request #149 from cicku/patch-2 by Eric Haszlakiewicz 2015-05-09 21:35:22 -0400
  • e4fce5d Merge pull request #171 from Nzbuu/vs2010_build by Eric Haszlakiewicz 2015-05-08 21:31:37 -0400
  • 8ba1937 Merge pull request #177 from cryogen/json-c-0.12 by Eric Haszlakiewicz 2015-05-08 21:20:54 -0400
  • e1eb298 Merge pull request #182 from tpetazzoni/libm-fix by Eric Haszlakiewicz 2015-05-08 21:19:48 -0400
  • 82a1316 Merge pull request #180 from yegorich/silent by Eric Haszlakiewicz 2015-05-08 21:19:05 -0400
  • 93582ad (refs/pull/182/head) Link against libm when needed by Thomas Petazzoni 2015-05-01 12:52:18 +0200
  • 36b0169 (refs/pull/180/head) Enable silent build by default by Yegor Yefremov 2015-04-25 21:57:38 +0200
  • cdca9d3 (refs/pull/179/head) Added array_list_del_idx and json_object_array_del_idx by Mark Swoope 2015-04-02 14:05:27 -0700
  • 89ae583 (refs/pull/177/head) Fix uninitialised variable compile warning, and also fix unused-when-used warning by Stuart Walsh 2015-03-31 12:23:03 +0100
  • 736f4b3 (refs/pull/171/head) Build random_seed.c as well by James Myatt 2015-02-05 16:38:47 +0000
  • 9d3d8d6 Add x64 build configurations by James Myatt 2015-02-05 16:15:06 +0000
  • e1a3f33 Set CompileAsCpp flag (Required for vs2010/winsdk71) Revert some project settings to defaults by James Myatt 2015-02-05 16:12:28 +0000
  • d5baa03 Update VS project to include current source files by James Myatt 2015-02-05 16:02:58 +0000
  • 18b3c49 Use more appropriate casts by James Myatt 2015-02-05 15:59:19 +0000
  • bf32650 Add missing include file to random_seed by James Myatt 2015-02-05 15:58:39 +0000
  • 720d566 Define macros from inttypes.h when not available by James Myatt 2015-02-05 15:58:12 +0000
  • 9be7170 json_tokener requires INF and NAN by James Myatt 2015-02-05 15:57:14 +0000
  • 72310c8 Define INFINITY and NAN when missing by James Myatt 2015-02-05 15:56:49 +0000
  • 0137103 Include config.h in linkhash so that HAVE_ENDIAN_H is defined (if available) by James Myatt 2015-02-05 15:55:25 +0000
  • a74f6b2 Updated config for vs2010/winsdk71 as well as vs2013 Define JSON_C_HAVE_INTTYPES_H in json_config.h.win32 only by James Myatt 2015-02-05 15:54:19 +0000
  • 68d856f Merge pull request #168 from bugness-chl/master by Eric Haszlakiewicz 2015-03-03 22:41:31 -0500
  • 7e3a6c6 Merge pull request #163 from sixlettervariables/fix-win32-build-problems by Eric Haszlakiewicz 2015-03-03 22:35:36 -0500
  • 8f5dcd8 (refs/pull/164/merge) Merge 933c5d2694 into da62fca305 by Andreas Baumann 2015-03-04 03:33:53 +0000
  • da62fca Merge pull request #144 from mhei/master by Eric Haszlakiewicz 2015-03-03 22:12:49 -0500
  • 484ca36 Slight style tweaks to the bsearch changest. by Eric Haszlakiewicz 2015-03-04 03:10:10 +0000
  • a500c1f Merge pull request #155 from LeSpocky/bsearch by Eric Haszlakiewicz 2015-03-03 22:00:08 -0500
  • 6f36900 (refs/pull/145/merge) Merge 975dbd4042 into 9db3099572 by jin-eld 2015-03-04 02:37:16 +0000
  • 9db3099 Merge pull request #156 from jubalh/master by Eric Haszlakiewicz 2015-03-03 21:37:02 -0500
  • 99d8fc9 (refs/pull/168/head) Tightening the number parsing algorithm by chl 2015-02-05 01:34:10 +0100
  • 4d18d39 (refs/pull/163/head) Adds json_config.h.win32 to project. Adds VS2k13 project. by Christopher Watford 2014-12-05 10:27:44 -0500
  • 0609a57 Fixes #160 'missing header file on windows' by Christopher Watford 2014-12-05 10:22:36 -0500
  • 938d3cc (refs/pull/162/merge) Merge e0bf3cc22b into ec4879ac5b by Alexandru Ardelean 2014-12-05 09:22:47 +0000
  • e0bf3cc (refs/pull/162/head) json_util: add directory check for POSIX distros by Alexandru Ardelean 2014-12-05 11:10:24 +0200
  • 933c5d2 (refs/pull/164/head) made it compile and link on Widnows (as static library) by Andreas Baumann 2014-09-14 20:25:54 +0200
  • ec4879a Merge pull request #153 from LeSpocky/doc by Eric Haszlakiewicz 2014-09-13 22:18:51 -0400
  • 6ec6fda Merge pull request #151 from mjchinn/json_type-comma by Eric Haszlakiewicz 2014-09-13 22:18:14 -0400
  • 2c72227 Merge pull request #150 from ams-cs/master by Eric Haszlakiewicz 2014-09-13 22:17:57 -0400
  • f88db70 Merge pull request #141 from AlexandruCostache/master by Eric Haszlakiewicz 2014-09-13 22:14:44 -0400
  • fcf5ad1 (refs/pull/156/head) Remove trailing whitespace by Michael Vetter 2014-08-26 14:48:59 +0200
  • 2f5789b (refs/pull/155/head) add bsearch for arrays by Alexander Dahl 2014-08-21 15:42:50 +0200
  • 37f5d86 (refs/pull/153/head) improve doc for json_object_to_json_string() by Alexander Dahl 2014-08-18 10:28:38 +0200
  • 048dcf2 (refs/pull/151/head) Remove json_type enum trailing comma by Michael J. Chinn 2014-08-10 00:46:25 -0400
  • ca0ebe0 (refs/pull/150/head) Fix build using MinGW. by Andrew Stubbs 2014-08-04 11:44:25 +0100
  • db833f2 (refs/pull/149/head) SONAME bump by Christopher Meng 2014-07-28 19:28:19 +0800