summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into json-c-0.10json-c-0.10-20120530Eric Haszlakiewicz2012-04-292-7/+52
|\
| * Update the ChangeLog with the rest of the changes that will be included in ↵Eric Haszlakiewicz2012-04-291-0/+22
| | | | | | | | the 0.10 release.
| * Fill in the missing pieces of the release checklist.Eric Haszlakiewicz2012-04-291-7/+30
| |
* | Merge branch 'master' into json-c-0.10Eric Haszlakiewicz2012-04-291-1/+1
|\ \ | |/
| * Change the format used for sprintbuf (but not scanf) to use %f instead of ↵Eric Haszlakiewicz2012-04-291-1/+1
| | | | | | | | | | | | %lf because the "l" is unnecessary and some compilers behave differently with it present (e.g. MinGW). Thanks for Mateusz Loskot for the fix.
* | Add the 0.10 release doxygen-generated docs to source control.Eric Haszlakiewicz2012-04-2843-0/+8527
| |
* | Add automake/autoconf generated files for the 0.10 release.Eric Haszlakiewicz2012-04-2810-0/+36689
|/
* Ignore the new test1Formatted and test2Formatted executables.Eric Haszlakiewicz2012-04-281-0/+2
|
* Extend test1 and test2 to run using json_object_to_json_string_ext() based ↵Eric Haszlakiewicz2012-04-2814-19/+293
| | | | | | | | | 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).
* Add a json_object_to_json_string_ext() function to allow the formatting of ↵Eric Haszlakiewicz2012-04-285-51/+171
| | | | | | | | | 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.
* Fixed parsing numbers in E notation. `Eric Haszlakiewicz2012-04-241-1/+2
|
* Since we already use a local json_bool type, replace any stdbool.h usage withEric Haszlakiewicz2012-04-243-6/+3
| | | | that, since not all environments actually have a stdbool.h to use.
* Merge pull request #25 from kdopen/doc_cleanupEric Haszlakiewicz2012-04-242-97/+83
|\ | | | | Clean up documentation and correct sample code
| * Clean up documentation and correct sample codeKeith Derrick2012-04-232-97/+83
| |
* | Merge pull request #23 from mloskot/mloskot-msvc-fixesEric Haszlakiewicz2012-04-231-1/+3
|\ \ | |/ |/| Fix missing inttypes.h definitions for Visual Studio 2010 and earliers. ...
| * Fix missing inttypes.h definitions for Visual Studio 2010 and earliers. ↵Mateusz Loskot2012-04-231-1/+3
|/ | | | Related to issue #22.
* Merge pull request #21 from kdopen/add_iteratorEric Haszlakiewicz2012-04-228-9/+522
|\ | | | | Add new iterator implementation and some NULL-pointer safety
| * Add alternative iterator implementationKeith Derrick2012-04-123-0/+425
| |
| * Add NULL-safe get object methodKeith Derrick2012-04-122-2/+45
| | | | | | | | | | New json_object_object_get_ex() method protects itself against null pointers and invalid objects being passed in.
| * Add NULL-safe lookup functionKeith Derrick2012-04-122-3/+26
| | | | | | | | | | New lh_table_lookup_ex() method protects itself against null pointers and invalid objects being passed in.
| * Add JASSERT macro to guarantee abortsKeith Derrick2012-04-121-4/+26
| |
* | Merge branch 'master' of https://github.com/json-c/json-cEric Haszlakiewicz2012-04-221-11/+62
|\ \
| * \ Merge pull request #20 from kdopen/masterEric Haszlakiewicz2012-04-191-11/+62
| |\ \ | | |/ | | | Additional explanatory comments
| | * Added explanatory notes to documentation.Keith Derrick2012-04-051-11/+62
| |/
* | Actually save the expected output for the test_printbuf test so it passes.Eric Haszlakiewicz2012-04-221-0/+32
| |
* | Update the list of files to ignore.Eric Haszlakiewicz2012-04-221-31/+35
| |
* | Add a test for the printbuf functions.Eric Haszlakiewicz2012-04-223-0/+182
| |
* | Use a different variable when referring to the json.la file, since the ↵Eric Haszlakiewicz2012-04-221-8/+8
| | | | | | | | original lib_LTLIBRARIES means something special to automake.
* | Move the rest of the tests into the tests subdirectory.Eric Haszlakiewicz2012-04-2221-34/+19
| |
* | Create a tests subdirectory and move one of the test to there.Eric Haszlakiewicz2012-04-227-7/+35
|/
* Fix some bugs with how buffer sizes were being calcuated in printbuf_memset ↵Eric Haszlakiewicz2012-04-031-6/+14
| | | | and an off-by-one error in printbuf_memappend.
* Remove the "#undef PRINTBUF_DEBUG" from printbuf.h so it can be more easily ↵Eric Haszlakiewicz2012-04-031-2/+0
| | | | turned on in the Makefile.
* Add a printbuf_memset() function to provide an effecient way to set and ↵Eric Haszlakiewicz2012-04-022-10/+58
| | | | append things like whitespace indentation.
* Direct people to send bug reports to the json-c google group.Eric Haszlakiewicz2012-03-312-2/+2
|
* Remove a few more things in the distclean target to get rid of *all* ↵Eric Haszlakiewicz2012-03-311-0/+1
| | | | generated files.
* Fix a bug in json_tokener_parse_ex when re-using the same tokener to parse ↵Eric Haszlakiewicz2012-03-311-1/+11
| | | | multiple objects. Now, json_tokener_reset() does not need to be called after a valid object is parsed.
* Split the json_tokener_parse tests off from test1 into their own test and ↵Eric Haszlakiewicz2012-03-317-133/+334
| | | | add several more cases to check various incremental parsing situations.
* For the prototype for json_tokener_error_desc().Eric Haszlakiewicz2012-03-311-3/+3
|
* Mention json_type_to_name() in the docs for json_object_get_type().Eric Haszlakiewicz2012-03-311-1/+3
|
* Define a LH_LOAD_FACTOR constant and note the range that it can be set to.Eric Haszlakiewicz2012-03-312-1/+8
| | | | | 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.
* Adjust json_object_is_type and json_object_get_type so they return ↵Eric Haszlakiewicz2012-03-314-0/+65
| | | | json_type_null for NULL objects.
* Merge pull request #16 from kdopen/masterEric Haszlakiewicz2012-03-313-13/+13
|\ | | | | Renaming the boolean type to json_bool in json_object.h
| * Rename boolean type to json_boolKeith Derrick2012-03-263-13/+13
| | | | | | | | | | | | | | | | 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.
* | Ignore several more files, include .o's, .lo's, etc...Eric Haszlakiewicz2012-03-311-0/+6
| |
* | Perform better error checking in json_tokener_parse_verbose and rewrite ↵Eric Haszlakiewicz2012-03-311-12/+9
|/ | | | | | 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/)
* Add json_tokener_get_error() and json_tokener_error_desc() to better ↵Eric Haszlakiewicz2012-02-222-0/+102
| | | | | | encapsulate the process of retrieving errors while parsing. Add documentation for the json_tokener_parse_ex() function.
* Include json_inttypes.h in json_object.h since we use types like int32_t in ↵Eric Haszlakiewicz2012-02-156-2/+27
| | | | | | | | 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.
* Merge branch 'master' of https://github.com/json-c/json-cEric Haszlakiewicz2012-02-155-7/+18
|\
| * Merge pull request #12 from jameinel/win32-projectEric Haszlakiewicz2012-02-155-7/+18
| |\ | | | | | | Some updates to make the code compatible with VC 9 (2008)
| | * Some updates to make the code compatible with VC 9 (2008)John Arbash Meinel2012-02-015-7/+18
| |/ | | | | | | | | VC 9 doesn't support late variable declarations, and doesn't have inttypes so we need some direct definitions of a couple of more types.
View Lorry Controller Status