mirror/json-c
1
0
Fork 0
mirror of https://github.com/json-c/json-c.git synced 2026-09-07 16:46:50 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,355 Commits 16 Branches 12 Tags
ff8ed0f094ddb48edad8169b711097f69fe8efea
Commit Graph
1355 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Colin Walters 6d9437725a autogen.sh: Add /bin/sh interpreter, honor NOCONFIGURE=1 
First, we should be able to execute as "./autogen.sh".  Second,
add support for NOCONFIGURE=1.  For more information,
see http://people.gnome.org/~walters/docs/build-api.txt
 2012-07-11 15:45:49 -04:00
Eric Haszlakiewicz 381f77c5bc Merge pull request #26 from ford-prefect/master 
Android build system
 2012-07-08 19:01:19 -07:00
Eric Haszlakiewicz 4154c55eda Add json_object_iterator.h to installed headers. 2012-07-08 20:38:53 -05:00
Eric Haszlakiewicz 9791c3896e Fix git commands for tagging a release. 2012-07-08 20:33:25 -05:00
Eric Haszlakiewicz eead1a7dc4 Remove unnecessary comment from json_util.c 2012-07-08 20:32:12 -05:00
Eric Haszlakiewicz 7bd49df30a Merge pull request #33 from mloskot/master 
Added a bunch of missing HAVE_* defines
 2012-07-08 18:27:02 -07:00
Mateusz Loskot 984303dfe5 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. 2012-06-19 20:15:44 +01:00
Eric Haszlakiewicz a789601e6d Merge pull request #27 from OBI-1/master 
array_list_expand_internal needs length, not index.
 2012-05-30 22:04:05 -07:00
Eric Haszlakiewicz c58386f33f Merge pull request #29 from mloskot/msvc-port 
Add missing casts from void* and replace #if HAVE_X with #ifdef HAVE_X
 2012-05-30 21:57:28 -07:00
Eric Haszlakiewicz 837d685d78 Use "nodoc", not "doc", for the name of the tarball w/o docs. 2012-05-30 23:03:34 -05:00
Mateusz Loskot 271c53ebdd Missing explicit casts from void* to specific pointers required. Added #define strcasecmp for Visual C++. 2012-05-22 23:51:44 +01:00
Mateusz Loskot a6f39a3c0c 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. 2012-05-21 23:22:36 +01:00
OBI-1 b6ff1c2f71 array_list_expand_internal needs length, not index. 
(The current implementation will fail when adding index 65.)
 2012-05-09 13:52:17 +03:00
Eric Haszlakiewicz 1abaaee658 Update the ChangeLog with the rest of the changes that will be included in the 0.10 release. 2012-04-29 12:54:14 -05:00
Eric Haszlakiewicz e7bd2e97f3 Fill in the missing pieces of the release checklist. 2012-04-29 12:54:04 -05:00
Eric Haszlakiewicz 0cc1db6459 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.
 2012-04-29 11:04:33 -05:00
Eric Haszlakiewicz 31faa49bd8 Ignore the new test1Formatted and test2Formatted executables. 2012-04-28 14:17:09 -05:00
Eric Haszlakiewicz 4c7f38eb9b 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).
 2012-04-28 14:14:26 -05:00
Eric Haszlakiewicz 3fcffe1bb0 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.
 2012-04-28 13:26:09 -05:00
Arun Raghavan a1221eba70 Add an Android-friendly build system 
This dependson the Androgenizer project, which helps keep autofoo-based build
systems in sync with the Android build.
 2012-04-26 13:18:33 +05:30
Arun Raghavan 17caddc0ab Run configure in the autogen.sh script 
This is convention in most open source projects.
 2012-04-26 13:18:33 +05:30
Arun Raghavan cb29a77c94 Add a pkgconfig file for uninstalled builds 
This allows systems certain types of build setups to work. Specifically, this
will help when building on Android and using json-c as a dependency for another
package.
 2012-04-26 13:18:33 +05:30
Eric Haszlakiewicz f931f61851 Fixed parsing numbers in E notation. ` 2012-04-24 22:17:13 -05:00
Eric Haszlakiewicz 4e000a65e6 Since we already use a local json_bool type, replace any stdbool.h usage with 
that, since not all environments actually have a stdbool.h to use.
 2012-04-24 21:54:07 -05:00
Eric Haszlakiewicz 0f8c534502 Merge pull request #25 from kdopen/doc_cleanup 
Clean up documentation and correct sample code
 2012-04-24 11:43:29 -07:00
Keith Derrick ded667a612 Clean up documentation and correct sample code 2012-04-23 15:34:44 -07:00
Eric Haszlakiewicz ec7ce26ba8 Merge pull request #23 from mloskot/mloskot-msvc-fixes 
Fix missing inttypes.h definitions for Visual Studio 2010 and earliers. ...
 2012-04-23 11:30:37 -07:00
Mateusz Loskot 8409dc039a Fix missing inttypes.h definitions for Visual Studio 2010 and earliers. Related to issue #22. 2012-04-23 13:11:11 +01:00
Eric Haszlakiewicz 178a4b059c Merge pull request #21 from kdopen/add_iterator 
Add new iterator implementation and some NULL-pointer safety
 2012-04-22 21:40:07 -07:00
Eric Haszlakiewicz 7502b377b7 Merge branch 'master' of https://github.com/json-c/json-c 2012-04-22 14:26:06 -05:00
Eric Haszlakiewicz 3d8817978c Actually save the expected output for the test_printbuf test so it passes. 2012-04-22 14:25:08 -05:00
Eric Haszlakiewicz 37cfe6bc4c Update the list of files to ignore. 2012-04-22 14:21:27 -05:00
Eric Haszlakiewicz e5c1e87f05 Add a test for the printbuf functions. 2012-04-22 14:13:01 -05:00
Eric Haszlakiewicz b80772a0f5 Use a different variable when referring to the json.la file, since the original lib_LTLIBRARIES means something special to automake. 2012-04-22 10:48:30 -05:00
Eric Haszlakiewicz c1b8891a13 Move the rest of the tests into the tests subdirectory. 2012-04-22 10:33:41 -05:00
Eric Haszlakiewicz 1e89ba68af Create a tests subdirectory and move one of the test to there. 2012-04-22 10:27:50 -05:00
Eric Haszlakiewicz 020ed640e8 Merge pull request #20 from kdopen/master 
Additional explanatory comments
 2012-04-19 21:03:22 -07:00
Keith Derrick bcfd1f57ac Add alternative iterator implementation 2012-04-12 11:51:23 -07:00
Keith Derrick 6917586acf Add NULL-safe get object method 
New json_object_object_get_ex() method protects itself against null pointers
and invalid objects being passed in.
 2012-04-12 11:50:08 -07:00
Keith Derrick 4a2cd966f5 Add NULL-safe lookup function 
New lh_table_lookup_ex() method protects itself against null pointers
and invalid objects being passed in.
 2012-04-12 11:47:56 -07:00
Keith Derrick 74d830dc03 Add JASSERT macro to guarantee aborts 2012-04-12 11:47:56 -07:00
Keith Derrick ca519fb817 Added explanatory notes to documentation. 2012-04-05 19:54:12 -07:00
Keith Derrick 65f649b7ba Ignoring additional build products 2012-04-05 19:38:02 -07:00
Keith Derrick 30dd367c0a Modify install names for library and include files 
Changing root name of library to json-c, and also the
directory where header files are installed to .../jsdon-c/*.

This avoids clashes with other implementations of JSON libraries.
 2012-04-05 19:38:02 -07:00
Keith Derrick 21d3706192 Added explanatory notes to documentation. 2012-04-05 19:37:35 -07:00
Eric Haszlakiewicz e0fa94ba31 Fix some bugs with how buffer sizes were being calcuated in printbuf_memset and an off-by-one error in printbuf_memappend. 2012-04-04 17:11:38 -07:00
Eric Haszlakiewicz 7f3298da85 Remove the "#undef PRINTBUF_DEBUG" from printbuf.h so it can be more easily turned on in the Makefile. 2012-04-04 17:11:38 -07:00
Eric Haszlakiewicz 8310d3634c Add a printbuf_memset() function to provide an effecient way to set and append things like whitespace indentation. 2012-04-04 17:11:38 -07:00
Eric Haszlakiewicz 0d79b53456 Fix some bugs with how buffer sizes were being calcuated in printbuf_memset and an off-by-one error in printbuf_memappend. 2012-04-03 14:54:25 -05:00
Eric Haszlakiewicz 61a154e58b Remove the "#undef PRINTBUF_DEBUG" from printbuf.h so it can be more easily turned on in the Makefile. 2012-04-03 14:48:15 -05:00