Eric Haszlakiewicz
381f77c5bc
Merge pull request #26 from ford-prefect/master
Android build system
13 years ago
Eric Haszlakiewicz
4154c55eda
Add json_object_iterator.h to installed headers.
13 years ago
Eric Haszlakiewicz
9791c3896e
Fix git commands for tagging a release.
13 years ago
Eric Haszlakiewicz
eead1a7dc4
Remove unnecessary comment from json_util.c
13 years ago
Eric Haszlakiewicz
7bd49df30a
Merge pull request #33 from mloskot/master
Added a bunch of missing HAVE_* defines
13 years ago
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.
13 years ago
Eric Haszlakiewicz
a789601e6d
Merge pull request #27 from OBI-1/master
array_list_expand_internal needs length, not index.
13 years ago
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
13 years ago
Eric Haszlakiewicz
837d685d78
Use "nodoc", not "doc", for the name of the tarball w/o docs.
13 years ago
Mateusz Loskot
271c53ebdd
Missing explicit casts from void* to specific pointers required. Added #define strcasecmp for Visual C++.
13 years ago
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.
13 years ago
OBI-1
b6ff1c2f71
array_list_expand_internal needs length, not index.
(The current implementation will fail when adding index 65.)
13 years ago
Eric Haszlakiewicz
1abaaee658
Update the ChangeLog with the rest of the changes that will be included in the 0.10 release.
13 years ago
Eric Haszlakiewicz
e7bd2e97f3
Fill in the missing pieces of the release checklist.
13 years ago
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.
13 years ago
Eric Haszlakiewicz
31faa49bd8
Ignore the new test1Formatted and test2Formatted executables.
13 years ago
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).
13 years ago
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.
13 years ago
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.
13 years ago
Arun Raghavan
17caddc0ab
Run configure in the autogen.sh script
This is convention in most open source projects.
13 years ago
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.
13 years ago
Eric Haszlakiewicz
f931f61851
Fixed parsing numbers in E notation. `
13 years ago
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.
13 years ago
Eric Haszlakiewicz
0f8c534502
Merge pull request #25 from kdopen/doc_cleanup
Clean up documentation and correct sample code
13 years ago
Keith Derrick
ded667a612
Clean up documentation and correct sample code
13 years ago
Eric Haszlakiewicz
ec7ce26ba8
Merge pull request #23 from mloskot/mloskot-msvc-fixes
Fix missing inttypes.h definitions for Visual Studio 2010 and earliers. ...
13 years ago
Mateusz Loskot
8409dc039a
Fix missing inttypes.h definitions for Visual Studio 2010 and earliers. Related to issue #22 .
13 years ago
Eric Haszlakiewicz
178a4b059c
Merge pull request #21 from kdopen/add_iterator
Add new iterator implementation and some NULL-pointer safety
13 years ago
Eric Haszlakiewicz
7502b377b7
Merge branch 'master' of https://github.com/json-c/json-c
13 years ago
Eric Haszlakiewicz
3d8817978c
Actually save the expected output for the test_printbuf test so it passes.
13 years ago
Eric Haszlakiewicz
37cfe6bc4c
Update the list of files to ignore.
13 years ago
Eric Haszlakiewicz
e5c1e87f05
Add a test for the printbuf functions.
13 years ago
Eric Haszlakiewicz
b80772a0f5
Use a different variable when referring to the json.la file, since the original lib_LTLIBRARIES means something special to automake.
13 years ago
Eric Haszlakiewicz
c1b8891a13
Move the rest of the tests into the tests subdirectory.
13 years ago
Eric Haszlakiewicz
1e89ba68af
Create a tests subdirectory and move one of the test to there.
13 years ago
Eric Haszlakiewicz
020ed640e8
Merge pull request #20 from kdopen/master
Additional explanatory comments
13 years ago
Keith Derrick
bcfd1f57ac
Add alternative iterator implementation
13 years ago
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.
13 years ago
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.
13 years ago
Keith Derrick
74d830dc03
Add JASSERT macro to guarantee aborts
13 years ago
Keith Derrick
ca519fb817
Added explanatory notes to documentation.
13 years ago
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.
13 years ago
Eric Haszlakiewicz
61a154e58b
Remove the "#undef PRINTBUF_DEBUG" from printbuf.h so it can be more easily turned on in the Makefile.
13 years ago
Eric Haszlakiewicz
2d48543f2e
Add a printbuf_memset() function to provide an effecient way to set and append things like whitespace indentation.
13 years ago
Eric Haszlakiewicz
781798ccdf
Direct people to send bug reports to the json-c google group.
13 years ago
Eric Haszlakiewicz
fbd207bd6b
Remove a few more things in the distclean target to get rid of *all* generated files.
13 years ago
Eric Haszlakiewicz
d809fa60c5
Fix a bug in json_tokener_parse_ex when re-using the same tokener to parse multiple objects. Now, json_tokener_reset() does not need to be called after a valid object is parsed.
13 years ago
Eric Haszlakiewicz
c5c623a546
Split the json_tokener_parse tests off from test1 into their own test and add several more cases to check various incremental parsing situations.
13 years ago
Eric Haszlakiewicz
1489b081a7
For the prototype for json_tokener_error_desc().
13 years ago
Eric Haszlakiewicz
6ff0817bac
Mention json_type_to_name() in the docs for json_object_get_type().
13 years ago