Commit Graph
-
fae0945json_object_set_boolean for upstream style check by 2016-09-21 01:31:00 +0300 -
9f9c332Merge pull request #267 from sixlettervariables/patch-1 by 2016-09-12 18:19:26 -0400 -
21e5ffb(refs/pull/267/head) Removes me as a maintainer, because I'm not. by 2016-09-12 14:18:21 -0400 -
ea1499aIssue #263: add const so the prototype for json_object_object_add_ex() matches the definition. by 2016-08-24 23:41:22 -0400 -
1ea6990(refs/pull/262/merge) Merge0518a9131bintoc5b5a984cdby 2016-08-25 02:58:34 +0000 -
c5b5a98Add Cmakefile by 2016-08-24 00:16:13 -0700 -
0518a91(refs/pull/262/head) Revert change to remove warnings. by 2016-08-24 09:39:57 -0700 -
70821dbAdd Cmakefile and fix compiler warning. by 2016-08-24 00:16:13 -0700 -
0fcf1d1Fix memory leak and inconsistent output (due to varying fd numbers) in test_util_file. by 2016-08-20 23:06:22 -0400 -
5fccfedIssue #260: add a check to prevent trivial loops in the object tree, even though it is up to the callers to avoid doing so in more complex cases. by 2016-08-20 22:41:49 -0400 -
c4d060bjson_object_object_add_ex() should have shared code with json_object_object_add(), and been changed to return int at the same time the latter was. Do that now. Also correct a couple of calls to _to_json_string to check the return value. by 2016-08-20 22:35:29 -0400 -
876f7b9(refs/pull/248/head) Minor changes in C source code by 2016-08-07 18:19:20 +0200 -
e40505eMerge branch 'RyDroid-tests' by 2016-08-13 09:17:25 -0400 -
61cd433Merge branch 'tests' of https://github.com/RyDroid/json-c into RyDroid-tests by 2016-08-13 09:17:01 -0400 -
e076ae7Merge pull request #251 from RyDroid/editorconfig by 2016-08-13 08:31:57 -0400 -
09e434d(refs/pull/248/merge) Merge3d867481e6into4d62de3898by 2016-08-12 22:59:03 +0000 -
8215c0a(refs/pull/254/head) Very minor changes to some tests by 2016-08-08 15:11:19 +0200 -
b222d43(refs/pull/251/head) Adding a file for EditorConfig by 2016-08-07 18:20:59 +0200 -
4d62de3Revert bogus change to json_object_get() made inf40b08d8that caused it to always return NULL. (Issue #259) Also undo NULL check in json_tokener_set_flags(): it's not at all valid toi try to set flags on a NULL pointer, and doing so should not be silently ignored. by 2016-08-11 17:03:16 -0400 -
0ad8764Merge pull request #255 from RyDroid/minor-c2 by 2016-08-10 15:06:30 -0400 -
9f9a9acMerge pull request #252 from RyDroid/minor-no-c by 2016-08-09 07:39:27 -0400 -
71d0615Merge branch 'jobol-issue-165' by 2016-08-09 07:38:18 -0400 -
f3db59dMerge branch 'issue-165' of https://github.com/jobol/json-c into jobol-issue-165 by 2016-08-09 07:36:54 -0400 -
bc3e691Merge pull request #253 from RyDroid/cppcheck-travis by 2016-08-08 22:57:56 -0400 -
51b011cMerge pull request #249 from RyDroid/readme by 2016-08-08 22:53:33 -0400 -
d758f4aAdd a brief style guide. Address Issue #257. by 2016-08-08 22:50:23 -0400 -
33ae9f5Merge pull request #250 from RyDroid/gitignore by 2016-08-08 18:42:01 +0000 -
ab1d761(refs/pull/250/head) Improving .gitignore by 2016-08-07 18:24:53 +0200 -
f2e7dda(refs/pull/249/head) Improving README by 2016-08-07 18:29:11 +0200 -
36b4003(refs/pull/253/head) Adding a test with cppcheck for Travis CI by 2016-08-08 15:23:27 +0200 -
f40b08d(refs/pull/255/head) Minor changes in C source code by 2016-08-08 15:20:41 +0200 -
250a398(refs/pull/252/head) Very minor changes not related to C source code by 2016-08-08 15:12:44 +0200 -
3d86748Minor changes in C source code by 2016-08-07 18:19:20 +0200 -
9688f34Issue #246: Include xlocale.h too, to get locale_t defined, since not all OSes include that in locale.h by 2016-08-02 22:25:05 -0400 -
1fceb22(refs/pull/243/head) test: add test of 'json_object_to_json_string_length' by 2016-08-01 15:04:54 +0200 -
fa76e4aIssue #195: Actually call uselocale() in the new locale handling code in json_tokener. Also, be sure the right locale_t is freed if we fail on the second uselocale. Finally, fix test_locale so it *doesn't* use json_object_to_json_string as that will simple re-emit the original parsed string values. by 2016-07-31 14:39:56 -0400 -
4091b9cIssue #195: use uselocale() instead of setlocale() in json_tokener to behave better in threaded environments. by 2016-07-30 21:34:58 -0400 -
7d63736Linux's %p format doesn't return "0x0" for NULL pointers, so switch to using %lx for consistency. by 2016-07-30 15:09:51 -0400 -
deb9fa4Issue #240: add arbitrary use of val's in foreach loops to squash warnings about unused variables. by 2016-07-30 18:27:53 +0000 -
344009bAdd method 'json_object_to_json_string_length' by 2016-07-26 19:22:25 +0200 -
54ae254Fix a compiling error by 2016-07-27 14:42:25 +0200 -
63f67ee(refs/pull/241/head) getting error in date string 19\/07\/2016, fixed for the error 19/07/2016 by 2016-07-20 18:34:21 +0530 -
b366750Merge pull request #239 from ploxiln/printbuf_empty by 2016-07-16 13:49:08 -0400 -
868b20c(refs/pull/239/head) initialize null terminator of new printbuf by 2016-07-16 00:30:31 -0400 -
2b255d0Fix absolute paths in test_util_file that vary depending on where it is run. by 2016-06-27 04:29:07 +0000 -
b1d65b6Issue #113: Add more files to EXTRA_DIST and a dist-hook to get distcheck to at least not fail. by 2016-06-27 04:28:34 +0000 -
1071385Issue #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. by 2016-06-27 03:46:38 +0000 -
29005efMerge pull request #238 from nagamalli9999/master by 2016-06-26 23:09:42 -0400 -
29ef73fIssue #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 by 2016-06-26 02:20:05 +0000 -
78cf6e6(refs/pull/238/head) linkhash.h: removed redundant params from comments by 2016-06-25 23:05:41 +0530 -
5fb63a0linkhash.c: optimised the table_free path by 2016-06-25 22:50:36 +0530 -
5958917Issue #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. by 2016-06-11 18:18:46 +0000 -
f285c0aIssue #175: disable the fast-and-loose code in hashlittle() when running with AddressSanitizer. by 2016-06-08 03:24:59 +0000 -
ae66b24Mention that we're aiming to follow RFC 7159 now. Cause README.md to show up in Doxygen output as the main page. by 2016-06-08 02:36:13 +0000 -
40de3c6Merge pull request #232 from NeoRaider/size_t2 by 2016-06-07 16:47:40 -0400 -
d13cfe1(refs/pull/232/head) tests/tests1: fix printf format for size_t arguments by 2016-06-07 10:49:42 +0200 -
b547ee0Update the index page to point at the 0.12.1 release. by 2016-06-07 04:16:05 +0000 -
17f3061Add the 0.12.1 release docs to gh-pages. by 2016-06-07 04:14:43 +0000 -
a42caacCopy over note about the 0.12.1 release to the master branch. by 2016-06-07 04:13:15 +0000 -
acbcc06(tag: json-c-0.12.1-20160607) Add doxygen-generated docs for the 0.12.1 release. by 2016-06-07 04:05:03 +0000 -
ef22400Update release version to 0.12.1 and generate configure script. by 2016-06-07 03:37:31 +0000 -
0539191Check 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. by 2016-06-07 03:26:46 +0000 -
1eb5a70Merge pull request #230 from ebassi/master by 2016-06-06 22:59:38 -0400 -
e61eb40Merge pull request #233 from NeoRaider/size_t3 by 2016-06-06 22:55:44 -0400 -
ce7ad48Merge pull request #234 from NeoRaider/userdata by 2016-06-06 22:54:40 -0400 -
0e1a057Remove reference to svn.metaparadigm.com by 2016-06-07 08:11:16 +1200 -
f87e378(refs/pull/234/head) Add public API to get and set userdata by 2016-05-29 05:54:57 +0200 -
c2b004bMake default double serializer ignore userdata again by 2016-05-29 04:54:38 +0200 -
22fdcfc(refs/pull/233/head) Include stddef.h in json_object.h by 2016-05-29 05:19:50 +0200 -
0175a79(refs/pull/231/merge) Merge7c2e09f41cinto7ae5c3f7a6by 2016-05-29 01:55:36 +0000 -
7c2e09f(refs/pull/231/head) Fix size_t size check for first-time builds by 2016-05-29 03:52:26 +0200 -
28c1ca1(refs/pull/230/head) Use stdint.h to check for size_t size by 2016-05-23 10:18:59 +0100 -
7ae5c3fIssue #142: un-deprecate json_object_object_get(), but note why you might want to use json_object_object_get_ex() instead. by 2016-05-23 03:02:34 +0000 -
5e4e5f7Issue #205: use _strdup instead of strdup on Windows. by 2016-05-23 02:37:09 +0000 -
f4ca132Merge branch 'doctaweeks-fixes-for-upstream' by 2016-05-23 02:12:51 +0000 -
996be85Fix a few places that needed adjustment for the size_t changes, including updating the range checks to use a calculated SIZE_T_MAX. by 2016-05-23 02:10:58 +0000 -
9a2915cMerge branch 'fixes-for-upstream' of https://github.com/doctaweeks/json-c into doctaweeks-fixes-for-upstream by 2016-05-23 02:08:28 +0000 -
b2c5969Merge pull request #193 from jplitza/master by 2016-05-18 16:10:27 -0400 -
21dc5dc(refs/pull/193/head) Export json_object_double_to_json_string() and use custom format string by 2016-05-06 16:12:44 +0200 -
2200ffaFix code in docs for json_object_new_double_s() by 2016-05-06 16:12:19 +0200 -
3345b25Add tests for the json_object_array_del_idx() function. by 2016-04-30 19:09:45 +0000 -
9edf241Merge branch 'Protovision-master' by 2016-04-30 18:53:16 +0000 -
1fb87cdMerge branch 'master' of https://github.com/Protovision/json-c into Protovision-master by 2016-04-30 18:52:47 +0000 -
e3fb749Merge pull request #216 from Jehan/master by 2016-04-30 14:45:16 -0400 -
c6a97ebMerge pull request #218 from sevan/patch-1 by 2016-04-30 14:44:29 -0400 -
82bdbdbMerge pull request #219 from rouault/low_heap_robustness_fixes by 2016-04-30 14:44:05 -0400 -
4e0c8b5Merge pull request #220 from hschaa/master by 2016-04-30 14:42:16 -0400 -
afa9f82Merge pull request #222 from chenha0/master by 2016-04-30 14:40:30 -0400 -
02a2151Merge pull request #223 from minaguib/master by 2016-04-30 14:36:02 -0400 -
138c2a6(refs/pull/223/head) Clarify json_object_get_string documentation of NULL handling & returning by 2016-02-07 20:55:25 -0500 -
dffdee9(refs/pull/222/head) Fix issue #221: JSON_C_TO_STRING_NOSLASHESCAPE works incorrectly by 2016-01-21 20:11:40 +0800 -
dec5fcd(refs/pull/220/head) Add some basic tests for verifying json_object_equal behavior by 2016-01-13 15:40:08 +0100 -
00e475cAdd utility function for comparing json_objects by 2016-01-13 15:40:02 +0100 -
77a4276(refs/pull/219/head) Fix various potential null ptr deref and int32 overflows by 2016-01-11 12:15:54 +0100 -
7150b7f(refs/pull/218/head) Use a macro to indicate C99 to the compiler by 2016-01-05 11:43:17 +0000 -
79c99ae(refs/pull/216/head) configure: check realloc with AC_CHECK_FUNCS() to fix cross-compilation. by 2016-01-01 18:35:14 +0100 -
537f8bcAdd const qualifiers to several functions that don't modify the json_object. by 2015-12-26 21:42:18 +0000 -
882b7d9Issue #137: remove config.h.in from change control. by 2015-12-08 21:20:42 -0600 -
e883f95(refs/pull/61/merge) Merge23520d6b6cinto980cdd61beby 2015-12-09 02:56:25 +0000 -
980cdd6Merge commit '2be921d88376e78f84d79aafa6db2714da804e59' by 2015-12-08 20:51:06 -0600