Commit Graph

  • *
  • | *
  • | *
  • | *
  • | *
  • * |
  • | | *
  • | | *
  • | | *
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • | * |
  • |/ /
  • | | *
  • | |/
  • |/|
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • |\ \
  • | | | *
  • | |_|/|
  • |/| |/
  • | |/|
  • | * |
  • |/ /
  • | | *
  • | | *
  • * |
  • | | *
  • * | |
  • | | | *
  • | |_|/|
  • |/| | |
  • | | | *
  • | | | *
  • | | | *
  • | | | *
  • | | | *
  • | |_|/
  • |/| |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • |\ \ \
  • * | | |
  • * | | |
  • * | | |
  • | | | | *
  • | |_|_|/|
  • |/| | | |
  • * | | | |
  • |\ \ \ \ \
  • | | | | | | *
  • | |_|_|_|_|/|
  • |/| | | | |/
  • | | | | |/|
  • | | | |/| |
  • | | |/| | |
  • | |/| | | |
  • * | | | | |
  • | |_|_|/ /
  • |/| | | |
  • | | | | *
  • | | | | *
  • | |_|_|/
  • |/| | |
  • | * | |
  • |/ / /
  • * | |
  • |\ \ \
  • | | | | *
  • | |_|_|/|
  • |/| | |/
  • | | |/|
  • | |/| |
  • | | | | *
  • | |_|_|/|
  • |/| | | |
  • * | | | |
  • * | | | |
  • * | | | |
  • * | | | |
  • |\ \ \ \ \
  • | | | | | | *
  • | |_|_|_|_|/|
  • |/| | | | | |
  • | | | | | | *
  • | |_|_|_|_|/
  • |/| | | | |
  • | | | | | | *
  • | |_|_|_|_|/|
  • |/| | | | |/
  • | | | | |/|
  • | | | |/| |
  • | | |/| | |
  • | |/| | | |
  • | * | | | |
  • |/ / / / /
  • | | | | | *
  • | |_|_|_|/|
  • |/| | | | |
  • | | | | | *
  • | |_|_|_|/
  • |/| | | |
  • | | | | | *
  • | |_|_|_|/|
  • |/| | | | |
  • | | | | | *
  • | | | | | *
  • | |_|_|_|/
  • |/| | | |
  • | | | | *
  • | |_|_|/
  • |/| | |
  • * | | |
  • |\ \ \ \
  • | | | | | *
  • | |_|_|_|/|
  • |/| | | |/
  • | | | |/|
  • | | |/| |
  • | |/| | |
  • * | | | |
  • |\ \ \ \ \
  • | | | | | | *
  • | |_|_|_|_|/|
  • |/| | | | |/
  • | | | | |/|
  • | | | |/| |
  • | | |/| | |
  • | |/| | | |
  • * | | | | |
  • | * | | | |
  • | * | | | |
  • |/ / / / /
  • | * / / /
  • |/ / / /
  • | | | *
  • | | | |\
  • | |_|_|/
  • |/| | |
  • * | | |
  • * | | |
  • | | | *
  • | | | |\
  • | |_|_|/
  • |/| | |
  • * | | |
  • | | | *
  • | | | *
  • | |_|/
  • |/| |
  • * | |
  • * | |
  • * | |
  • | * |
  • | * |
  • | * |
  • |/ /
  • 952a07d (refs/pull/55/head) Optimize json_parse_int64 when sscanf work as expected by Remi Collet 2012-12-13 16:10:39 +0100
  • 32d149c (refs/pull/52/head) probably worth an option for this by Remi Collet 2012-12-13 11:46:04 +0100
  • 8c84796 Save space, drop unuseful trailing zeroes by Remi Collet 2012-12-13 11:22:31 +0100
  • 4014fe8 Simple fix to double encode by Remi Collet 2012-12-13 11:16:03 +0100
  • a01b659 move locale change to be global for perf by Remi Collet 2012-12-13 09:47:33 +0100
  • 4e4af93 Fix issue #53 - ensure explicit length string are still NUL terminated, and fix json_tokener_parse() to work properly with embedded unicode \u0000 values in strings. Adjust test_null to check for this case. See also http://bugs.debian.org/687269 by Eric Haszlakiewicz 2012-12-09 16:32:11 -0600
  • 5c2a69a (json-c-0.10) Added a bunch of missing HAVE_* defines tested with ./configure script to fix compilation on Linux with GCC 4.7.1. The issue likely caused by my previous commits related to Visual C++ port of the code. by Mateusz Loskot 2012-06-19 20:15:44 +0100
  • 4392b22 Regenerate Makefile.in by Eric Haszlakiewicz 2012-12-09 15:51:02 -0600
  • e1663d4 Remove configure as part of maintainer-clean instead of distclean. Addresses issue #48. by Eric Haszlakiewicz 2012-12-09 15:46:35 -0600
  • 7a4506d Remove configure as part of maintainer-clean instead of distclean. Addresses issue #48. by Eric Haszlakiewicz 2012-12-09 15:46:35 -0600
  • 7653d49 Add PACKAGE_URL to config.h.in by Eric Haszlakiewicz 2012-12-09 15:46:23 -0600
  • aec8763 Add a missing json_object_get() so we don't try to use a freed object in test1. by Eric Haszlakiewicz 2012-11-29 15:06:17 -0500
  • 447b88a Fix a memory leak in the test_printbuf test. by Eric Haszlakiewicz 2012-11-29 13:29:55 -0600
  • 23461c7 Include json_object_iterator.c in the list of sources. by Eric Haszlakiewicz 2012-11-29 13:23:06 -0600
  • 16a4a32 float parsing must be locale independent by Remi Collet 2012-11-27 11:06:49 +0100
  • 197cb1d (refs/pull/51/head) Make maximum recursion depth a runtime option by Remi Collet 2012-11-27 09:01:45 +0100
  • f6b27cb Make it safe to delete keys while iterating with the json_object_object_foreach macro. by Eric Haszlakiewicz 2012-10-20 20:26:37 -0500
  • 5abc0ea Reformat the json_object_object_foreach macro so it is readable, and document what is allowed to be done with the object while iterating. by Eric Haszlakiewicz 2012-10-20 20:10:15 -0500
  • e36e562 Reformat json_object_object_get() and json_object_object_get_ex(). by Eric Haszlakiewicz 2012-10-18 17:16:36 -0500
  • 5450bed Fix json_object_object_get() so it returns NULL if the incoming json_object is NULL. by Eric Haszlakiewicz 2012-10-18 17:14:41 -0500
  • 5f4739e Change json_object_put to return 1 if the object passed was actually freed. (or 0 if only the reference count was decremented) by Eric Haszlakiewicz 2012-10-18 17:10:09 -0500
  • c3d1d59 Fix a memory leak in test1 with respect to how json_object_object_del was used. by Eric Haszlakiewicz 2012-09-16 20:49:22 -0500
  • c3068bf Reformat the test sources. No functional change. by Eric Haszlakiewicz 2012-09-16 20:43:29 -0500
  • d1f237e Fix the home page in the README, and add a list of prerequisites. by Eric Haszlakiewicz 2012-09-10 17:32:14 -0500
  • 059e8f4 Merge pull request #44 from lastquestion/fix_gnu_macosx by Eric Haszlakiewicz 2012-09-09 19:24:47 -0700
  • e22e4a1 (refs/pull/44/merge) Merge e7e0600405 into 4b1a0668a8 by Lin Xu 2012-09-09 17:42:07 -0700
  • e7e0600 (refs/pull/44/head) Add an autoconf test to test whether the .section .gnu<warning> works with the linker on the system, and define _warn_references to nothing if not. by Lin Xu 2012-09-09 17:33:35 -0700
  • d5d41bc Copy over the win32 readme file too. by Eric Haszlakiewicz 2012-09-09 15:05:09 -0500
  • 2003e42 Add a copy of the json-c-0.10 docs in a form that should be browsable on github. by Eric Haszlakiewicz 2012-09-09 14:58:17 -0500
  • 4b1a066 Update the set_serializer test to match the actual output. by Eric Haszlakiewicz 2012-09-09 13:53:12 -0500
  • 77e2da7 (refs/pull/45/head) test_printbuf: Free data when we are done with it. by Jonathan Clairembault 2012-09-08 18:59:48 +0200
  • 38f421a Add a json_set_serializer() function to allow the string output of a json_object to be customized. by Eric Haszlakiewicz 2012-09-02 15:21:56 -0500
  • 9a25d7e (refs/pull/42/merge) Merge 5065515925 into f74e8f8f9b by Helder Magalhães 2012-08-07 00:53:35 -0700
  • 5065515 (refs/pull/42/head) Fix XHTML by Helder Magalhães 2012-08-07 08:52:54 +0100
  • de478dd Fix EOL to Linux by Helder Magalhães 2012-08-06 23:36:29 +0100
  • 292bbb0 Several readme files fixes by Helder Magalhães 2012-08-06 23:27:56 +0100
  • 8ba7c40 Fix EOL to Linux by Helder Magalhães 2012-08-06 22:19:41 +0100
  • 71776bb Few typos and whitespace fixes by Helder Magalhães 2012-08-06 22:09:20 +0100
  • f74e8f8 Add my copyright. by Eric Haszlakiewicz 2012-07-29 20:02:00 -0500
  • d305cae Ignore the tests/testReplaceExisting binary. by Eric Haszlakiewicz 2012-07-29 20:00:28 -0500
  • 8ce53f9 (refs/pull/493/head) Note the rename in the ChangeLog, and update the instructions in the README file. by Eric Haszlakiewicz 2012-07-29 18:43:55 -0500
  • 2f2180b Take a guess as to the rename changes changes needed to the Android part of the build. I think this should work, but I can't test it. by Eric Haszlakiewicz 2012-07-29 18:29:38 -0500
  • 1f9d199 Re-add the "json" pkg-config file as a compatibility shim. Also rename the json-c-uninstalled.pc file. by Eric Haszlakiewicz 2012-07-29 18:25:09 -0500
  • 9f16e25 Bump the version of the new library since programs will need to be re-linked to use it. by Eric Haszlakiewicz 2012-07-29 18:05:34 -0500
  • 943b7a4 Add a compatibility symlink json->json-c in the include directory. by Eric Haszlakiewicz 2012-07-29 18:05:08 -0500
  • 075b783 Add a --disable-oldname-compat option to configure to turn off the creation of the libjson.so library, and only include libjson-c.so by Eric Haszlakiewicz 2012-07-29 17:48:22 -0500
  • c7a2120 Ignore a couple more generated files. by Eric Haszlakiewicz 2012-07-29 15:10:30 -0500
  • 082419e Fix the Libs line in json-uninstalled.pc to use -ljson-c by Eric Haszlakiewicz 2012-07-29 15:09:59 -0500
  • b98aa6e Create an additional libjson.so library that simply links against libjson-c, but emits a warning encouraging the use of the new library. by Eric Haszlakiewicz 2012-07-29 14:59:01 -0500
  • eb37094 Check for the sys/cdefs.h header which on some systems defines the __warn_references macro. by Eric Haszlakiewicz 2012-07-29 14:57:59 -0500
  • ba1c381 Remove test_parse from the top level directory. (accidentally re-introduced with the last merge) by Eric Haszlakiewicz 2012-07-29 14:08:26 -0500
  • c2d3ccf Merge branch 'rename_library' of https://github.com/kdopen/json-c into kdopen-rename_library by Eric Haszlakiewicz 2012-07-29 14:06:52 -0500
  • 92f31bd Handle the \f escape sequence (the two characters: backslash followed by an f, not a literal formfeed) and extend the test_parse test to check all valid escape sequences. by Eric Haszlakiewicz 2012-07-29 12:31:07 -0500
  • 8fcfeb6 Default autogen.sh to not running configure, unless some command line options are specified. by Eric Haszlakiewicz 2012-07-29 12:18:37 -0500
  • 77c6239 Initialize errno before calling sscanf in json_parse_int64() so parsing valid numbers after parsing an out of range number works. by Eric Haszlakiewicz 2012-07-29 12:13:54 -0500
  • 222a089 (refs/pull/38/merge) Merge 1efafe1011 into 2da148df56 by Patrick Horn 2012-07-29 09:46:33 -0700
  • 2da148d Merge pull request #37 from cgwalters/master by Eric Haszlakiewicz 2012-07-29 09:46:22 -0700
  • 3a4f56f (refs/pull/37/merge) Merge 6d9437725a into 6988f53fcb by Colin Walters 2012-07-29 09:45:55 -0700
  • 6988f53 Rewrite json_object_object_add to replace just the value if the key already exists so keys remain valid. This is particularly useful when replacing values in a loop, since it allows the key used by json_object_object_foreach to continue to be used. by Eric Haszlakiewicz 2012-07-24 23:27:41 -0500
  • 1efafe1 (refs/pull/38/head) Handle \f which can sometimes be emitted by python by Patrick Horn 2012-07-17 12:15:54 -0700
  • 35d0a7c Fix parse bug with numbers between 2^63 and 2^64-1. by Patrick Horn 2012-07-16 15:15:57 -0700
  • 6d94377 (refs/pull/37/head) autogen.sh: Add /bin/sh interpreter, honor NOCONFIGURE=1 by Colin Walters 2012-07-11 15:33:49 -0400
  • 381f77c Merge pull request #26 from ford-prefect/master by Eric Haszlakiewicz 2012-07-08 19:01:19 -0700
  • f92353c (refs/pull/26/merge) Merge a1221eba70 into 4154c55eda by GitHub Merge Button 2012-07-08 18:50:57 -0700
  • f6a2251 (refs/pull/30/merge) Merge 4d70844730 into 4154c55eda by GitHub Merge Button 2012-07-08 18:41:42 -0700
  • 4154c55 Add json_object_iterator.h to installed headers. by Eric Haszlakiewicz 2012-07-08 20:38:53 -0500
  • 9791c38 Fix git commands for tagging a release. by Eric Haszlakiewicz 2012-07-08 20:33:25 -0500
  • eead1a7 Remove unnecessary comment from json_util.c by Eric Haszlakiewicz 2012-07-08 20:32:12 -0500
  • 7bd49df Merge pull request #33 from mloskot/master by Eric Haszlakiewicz 2012-07-08 18:27:02 -0700
  • 506a020 (refs/pull/34/merge) Merge 660209fbb1 into a789601e6d by GitHub Merge Button 2012-06-20 23:15:40 -0700
  • 660209f (refs/pull/34/head) Fix test warning: strlen() returns size_t, not int. by Anthony J. Bentley 2012-06-21 00:11:00 -0600
  • 619949c (refs/pull/33/merge) Merge 984303dfe5 into a789601e6d by GitHub Merge Button 2012-06-19 12:19:04 -0700
  • 984303d (refs/pull/33/head) Added a bunch of missing HAVE_* defines tested with ./configure script to fix compilation on Linux with GCC 4.7.1. The issue likely caused by my previous commits related to Visual C++ port of the code. by Mateusz Loskot 2012-06-19 20:15:44 +0100
  • 17b99b5 (refs/pull/32/merge) Merge 22ec54074f into a789601e6d by GitHub Merge Button 2012-06-11 07:58:06 -0700
  • 22ec540 (refs/pull/32/head) Fixing a compile problem that hits the #error in the cpp on the strdup and snprintf. Using the i686-apple-darwin10-gcc-4.2.1 compiler on OSX 10.6 (Snow Leopard). by Oscar Koeroo 2012-06-11 16:55:42 +0200
  • 06b2d33 (refs/pull/31/merge) Merge 8aaf0b1f40 into a789601e6d by GitHub Merge Button 2012-06-05 16:40:07 -0700
  • 8aaf0b1 (refs/pull/31/head) build: Added json_object_iterator.h to installed headers by Bruno Lima 2012-06-05 20:39:07 -0300
  • c13d63c build: Added snprintf and strdup to AC_CHECK_FUNCS in order to compile with OS X. by Bruno Lima 2012-06-05 14:27:49 -0300
  • 4d70844 (refs/pull/30/head) fix json_object_new_string() segfault if *s == NULL by MATSUMOTO Ryosuke 2012-06-01 01:27:02 +0900
  • a789601 Merge pull request #27 from OBI-1/master by Eric Haszlakiewicz 2012-05-30 22:04:05 -0700
  • 3c8844c (refs/pull/27/merge) Merge b6ff1c2f71 into c58386f33f by GitHub Merge Button 2012-05-30 21:57:43 -0700
  • c58386f Merge pull request #29 from mloskot/msvc-port by Eric Haszlakiewicz 2012-05-30 21:57:28 -0700
  • 14e4f5f (refs/pull/29/merge) Merge 271c53ebdd into 837d685d78 by GitHub Merge Button 2012-05-30 21:52:40 -0700
  • 837d685 Use "nodoc", not "doc", for the name of the tarball w/o docs. by Eric Haszlakiewicz 2012-05-30 23:03:34 -0500
  • 271c53e (refs/pull/29/head) Missing explicit casts from void* to specific pointers required. Added #define strcasecmp for Visual C++. by Mateusz Loskot 2012-05-22 23:51:44 +0100
  • a6f39a3 Replaced #if HAVE_X with #ifdef HAVE_X as the former test is troublemaker with #define HAVE_X where #define HAVE_X 1|0 is meant. by Mateusz Loskot 2012-05-21 23:22:36 +0100
  • b6ff1c2 (refs/pull/27/head) array_list_expand_internal needs length, not index. (The current implementation will fail when adding index 65.) by OBI-1 2012-05-09 13:52:17 +0300
  • b7cfd15 (tag: json-c-0.10-20120530) Merge remote-tracking branch 'origin/master' into json-c-0.10 by Eric Haszlakiewicz 2012-04-29 12:55:43 -0500
  • 1abaaee Update the ChangeLog with the rest of the changes that will be included in the 0.10 release. by Eric Haszlakiewicz 2012-04-29 12:54:14 -0500
  • e7bd2e9 Fill in the missing pieces of the release checklist. by Eric Haszlakiewicz 2012-04-29 12:54:04 -0500
  • f22de2c Merge branch 'master' into json-c-0.10 by Eric Haszlakiewicz 2012-04-29 11:15:56 -0500
  • 0cc1db6 Change the format used for sprintbuf (but not scanf) to use %f instead of %lf because the "l" is unnecessary and some compilers behave differently with it present (e.g. MinGW). Thanks for Mateusz Loskot for the fix. by Eric Haszlakiewicz 2012-04-29 11:04:33 -0500
  • 86bf051 Add the 0.10 release doxygen-generated docs to source control. by Eric Haszlakiewicz 2012-04-28 15:54:56 -0500
  • c75ad20 Add automake/autoconf generated files for the 0.10 release. by Eric Haszlakiewicz 2012-04-28 15:51:43 -0500
  • 31faa49 Ignore the new test1Formatted and test2Formatted executables. by Eric Haszlakiewicz 2012-04-28 14:17:09 -0500
  • 4c7f38e Extend test1 and test2 to run using json_object_to_json_string_ext() based on an additional command line parameter. Extend the run_output_test() function so we actually can pass command line parameters and so we can support different output files for the same test executable. Also provide some hints about what to do if a test fails (i.e. set VERBOSE=1). by Eric Haszlakiewicz 2012-04-28 14:14:26 -0500
  • 3fcffe1 Add a json_object_to_json_string_ext() function to allow the formatting of output to be selected. There are now three options: JSON_C_TO_STRING_SPACED, JSON_C_TO_STRING_PLAIN and JSON_C_TO_STRING_PRETTY. This also add a json_object_to_file_ext() that takes the same flags. Existing output of json_object_to_json_string() is unchanged, and uses JSON_C_TO_STRING_SPACED. Thanks fo Grant Edwards for the initial patches. by Eric Haszlakiewicz 2012-04-28 13:26:09 -0500
  • a1221eb (refs/pull/26/head) Add an Android-friendly build system by Arun Raghavan 2012-01-20 13:00:45 +0530
  • 17caddc Run configure in the autogen.sh script by Arun Raghavan 2012-01-20 12:59:59 +0530
  • cb29a77 Add a pkgconfig file for uninstalled builds by Arun Raghavan 2012-01-20 12:59:30 +0530