Mateusz Loskot
5c2a69a8b8
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
4392b22e80
Regenerate Makefile.in
12 years ago
Eric Haszlakiewicz
e1663d4dfa
Remove configure as part of maintainer-clean instead of distclean. Addresses issue #48 .
12 years ago
Eric Haszlakiewicz
b7cfd15705
Merge remote-tracking branch 'origin/master' into json-c-0.10
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
f22de2c112
Merge branch 'master' into json-c-0.10
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
86bf051fd2
Add the 0.10 release doxygen-generated docs to source control.
13 years ago
Eric Haszlakiewicz
c75ad201dd
Add automake/autoconf generated files for the 0.10 release.
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
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
Eric Haszlakiewicz
64c0ca3690
Define a LH_LOAD_FACTOR constant and note the range that it can be set to.
Change the resize check from "count > size" to "count >= size" to avoid a
potential infinite loop with high load factors and a full hash table.
13 years ago
Eric Haszlakiewicz
aef439a175
Adjust json_object_is_type and json_object_get_type so they return json_type_null for NULL objects.
13 years ago
Eric Haszlakiewicz
7e57d63aeb
Merge pull request #16 from kdopen/master
Renaming the boolean type to json_bool in json_object.h
13 years ago
Eric Haszlakiewicz
d3c37b82a6
Ignore several more files, include .o's, .lo's, etc...
13 years ago
Eric Haszlakiewicz
3620cba6d0
Perform better error checking in json_tokener_parse_verbose and rewrite json_tokener_parse to use that instead of json_tokener_parse_ex.
Fix a typo in the string represenations of the json_tokener_error_depth error (s/to deep/too deep/)
13 years ago
Keith Derrick
37e7467476
Rename boolean type to json_bool
In building large systems, there are often clashes over the
preferred base type to use for bool/boolean. At least one
experience has been with a 3rd party proprietary library which
can not be changed. In that case, boolean was a synonym for
unsigned char and used widely in packed structures.
13 years ago
Eric Haszlakiewicz
2f9091f559
Add json_tokener_get_error() and json_tokener_error_desc() to better encapsulate the process of retrieving errors while parsing.
Add documentation for the json_tokener_parse_ex() function.
13 years ago
Eric Haszlakiewicz
b21b137805
Include json_inttypes.h in json_object.h since we use types like int32_t in the API and some systems need that header to compile.
As part of this create a public json_config.h with a custom define to
decide whether to include inttypes.h to avoid conflicting with other
projects config.h header.
13 years ago