d5d41bc017
Copy over the win32 readme file too.
Eric Haszlakiewicz
2012-09-09 15:05:09 -05:00
2003e427ac
Add a copy of the json-c-0.10 docs in a form that should be browsable on github.
Eric Haszlakiewicz
2012-09-09 14:58:17 -05:00
4b1a0668a8
Update the set_serializer test to match the actual output.
Eric Haszlakiewicz
2012-09-09 13:53:12 -05:00
38f421a2e7
Add a json_set_serializer() function to allow the string output of a json_object to be customized.
Eric Haszlakiewicz
2012-09-02 15:21:56 -05:00
f74e8f8f9b
Add my copyright.
Eric Haszlakiewicz
2012-07-29 20:02:00 -05:00
d305cae12c
Ignore the tests/testReplaceExisting binary.
Eric Haszlakiewicz
2012-07-29 20:00:28 -05:00
8ce53f9d1e
Note the rename in the ChangeLog, and update the instructions in the README file.
Eric Haszlakiewicz
2012-07-29 18:43:55 -05:00
2f2180b70d
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.
Eric Haszlakiewicz
2012-07-29 18:29:38 -05:00
1f9d199522
Re-add the "json" pkg-config file as a compatibility shim. Also rename the json-c-uninstalled.pc file.
Eric Haszlakiewicz
2012-07-29 18:25:09 -05:00
9f16e25a3e
Bump the version of the new library since programs will need to be re-linked to use it.
Eric Haszlakiewicz
2012-07-29 18:05:34 -05:00
943b7a4de7
Add a compatibility symlink json->json-c in the include directory.
Eric Haszlakiewicz
2012-07-29 18:05:08 -05:00
075b783631
Add a --disable-oldname-compat option to configure to turn off the creation of the libjson.so library, and only include libjson-c.so
Eric Haszlakiewicz
2012-07-29 17:48:22 -05:00
c7a21203de
Ignore a couple more generated files.
Eric Haszlakiewicz
2012-07-29 15:10:30 -05:00
082419edf9
Fix the Libs line in json-uninstalled.pc to use -ljson-c
Eric Haszlakiewicz
2012-07-29 15:09:59 -05:00
b98aa6eaa3
Create an additional libjson.so library that simply links against libjson-c, but emits a warning encouraging the use of the new library.
Eric Haszlakiewicz
2012-07-29 14:59:01 -05:00
eb37094aa6
Check for the sys/cdefs.h header which on some systems defines the __warn_references macro.
Eric Haszlakiewicz
2012-07-29 14:57:59 -05:00
ba1c3810cb
Remove test_parse from the top level directory. (accidentally re-introduced with the last merge)
Eric Haszlakiewicz
2012-07-29 14:08:26 -05:00
92f31bd99a
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.
Eric Haszlakiewicz
2012-07-29 12:31:07 -05:00
8fcfeb63ec
Default autogen.sh to not running configure, unless some command line options are specified.
Eric Haszlakiewicz
2012-07-29 12:18:37 -05:00
77c6239465
Initialize errno before calling sscanf in json_parse_int64() so parsing valid numbers after parsing an out of range number works.
Eric Haszlakiewicz
2012-07-29 12:13:54 -05:00
2da148df56
Merge pull request #37 from cgwalters/master
Eric Haszlakiewicz
2012-07-29 09:46:22 -07:00
6988f53fcb
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.
Eric Haszlakiewicz
2012-07-24 23:27:41 -05:00
381f77c5bc
Merge pull request #26 from ford-prefect/master
Eric Haszlakiewicz
2012-07-08 19:01:19 -07:00
4154c55eda
Add json_object_iterator.h to installed headers.
Eric Haszlakiewicz
2012-07-08 20:38:53 -05:00
9791c3896e
Fix git commands for tagging a release.
Eric Haszlakiewicz
2012-07-08 20:33:25 -05:00
eead1a7dc4
Remove unnecessary comment from json_util.c
Eric Haszlakiewicz
2012-07-08 20:32:12 -05:00
7bd49df30a
Merge pull request #33 from mloskot/master
Eric Haszlakiewicz
2012-07-08 18:27:02 -07:00
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.
Mateusz Loskot
2012-06-19 20:15:44 +01:00
a789601e6d
Merge pull request #27 from OBI-1/master
Eric Haszlakiewicz
2012-05-30 22:04:05 -07:00
c58386f33f
Merge pull request #29 from mloskot/msvc-port
Eric Haszlakiewicz
2012-05-30 21:57:28 -07:00
837d685d78
Use "nodoc", not "doc", for the name of the tarball w/o docs.
Eric Haszlakiewicz
2012-05-30 23:03:34 -05:00
271c53ebdd
Missing explicit casts from void* to specific pointers required. Added #define strcasecmp for Visual C++.
Mateusz Loskot
2012-05-22 23:51:44 +01:00
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.
Mateusz Loskot
2012-05-21 23:22:36 +01:00
b6ff1c2f71
array_list_expand_internal needs length, not index. (The current implementation will fail when adding index 65.)
OBI-1
2012-05-09 13:52:17 +03:00
b7cfd15705
Merge remote-tracking branch 'origin/master' into json-c-0.10
json-c-0.10-20120530
Eric Haszlakiewicz
2012-04-29 12:55:43 -05:00
1abaaee658
Update the ChangeLog with the rest of the changes that will be included in the 0.10 release.
Eric Haszlakiewicz
2012-04-29 12:54:14 -05:00
e7bd2e97f3
Fill in the missing pieces of the release checklist.
Eric Haszlakiewicz
2012-04-29 12:54:04 -05:00
f22de2c112
Merge branch 'master' into json-c-0.10
Eric Haszlakiewicz
2012-04-29 11:15:56 -05:00
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.
Eric Haszlakiewicz
2012-04-29 11:04:33 -05:00
86bf051fd2
Add the 0.10 release doxygen-generated docs to source control.
Eric Haszlakiewicz
2012-04-28 15:54:56 -05:00
c75ad201dd
Add automake/autoconf generated files for the 0.10 release.
Eric Haszlakiewicz
2012-04-28 15:51:43 -05:00
31faa49bd8
Ignore the new test1Formatted and test2Formatted executables.
Eric Haszlakiewicz
2012-04-28 14:17:09 -05:00
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).
Eric Haszlakiewicz
2012-04-28 14:14:26 -05:00
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.
Eric Haszlakiewicz
2012-04-28 13:26:09 -05:00
a1221eba70
Add an Android-friendly build system
Arun Raghavan
2012-01-20 13:00:45 +05:30
17caddc0ab
Run configure in the autogen.sh script
Arun Raghavan
2012-01-20 12:59:59 +05:30
cb29a77c94
Add a pkgconfig file for uninstalled builds
Arun Raghavan
2012-01-20 12:59:30 +05:30
f931f61851
Fixed parsing numbers in E notation. `
Eric Haszlakiewicz
2012-04-24 22:17:13 -05:00
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.
Eric Haszlakiewicz
2012-04-24 21:54:07 -05:00
0f8c534502
Merge pull request #25 from kdopen/doc_cleanup
Eric Haszlakiewicz
2012-04-24 11:43:29 -07:00
ded667a612
Clean up documentation and correct sample code
Keith Derrick
2012-04-23 15:34:44 -07:00
ec7ce26ba8
Merge pull request #23 from mloskot/mloskot-msvc-fixes
Eric Haszlakiewicz
2012-04-23 11:30:37 -07:00
8409dc039a
Fix missing inttypes.h definitions for Visual Studio 2010 and earliers. Related to issue #22.
Mateusz Loskot
2012-04-23 13:11:11 +01:00
178a4b059c
Merge pull request #21 from kdopen/add_iterator
Eric Haszlakiewicz
2012-04-22 21:40:07 -07:00
3d8817978c
Actually save the expected output for the test_printbuf test so it passes.
Eric Haszlakiewicz
2012-04-22 14:25:08 -05:00
37cfe6bc4c
Update the list of files to ignore.
Eric Haszlakiewicz
2012-04-22 14:21:27 -05:00
e5c1e87f05
Add a test for the printbuf functions.
Eric Haszlakiewicz
2012-04-22 14:13:01 -05:00
b80772a0f5
Use a different variable when referring to the json.la file, since the original lib_LTLIBRARIES means something special to automake.
Eric Haszlakiewicz
2012-04-22 10:48:30 -05:00
c1b8891a13
Move the rest of the tests into the tests subdirectory.
Eric Haszlakiewicz
2012-04-22 10:33:41 -05:00
1e89ba68af
Create a tests subdirectory and move one of the test to there.
Eric Haszlakiewicz
2012-04-22 10:27:50 -05:00
020ed640e8
Merge pull request #20 from kdopen/master
Eric Haszlakiewicz
2012-04-19 21:03:22 -07:00
bcfd1f57ac
Add alternative iterator implementation
Keith Derrick
2012-04-12 09:54:21 -07:00
6917586acf
Add NULL-safe get object method
Keith Derrick
2012-04-12 11:44:13 -07:00
4a2cd966f5
Add NULL-safe lookup function
Keith Derrick
2012-04-12 11:43:34 -07:00
74d830dc03
Add JASSERT macro to guarantee aborts
Keith Derrick
2012-04-12 11:40:44 -07:00
ca519fb817
Added explanatory notes to documentation.
Keith Derrick
2012-04-05 19:33:09 -07:00
65f649b7ba
Ignoring additional build products
Keith Derrick
2012-03-30 12:34:01 -07:00
30dd367c0a
Modify install names for library and include files
Keith Derrick
2012-03-30 12:28:32 -07:00
21d3706192
Added explanatory notes to documentation.
Keith Derrick
2012-04-05 19:33:09 -07:00
e0fa94ba31
Fix some bugs with how buffer sizes were being calcuated in printbuf_memset and an off-by-one error in printbuf_memappend.
Eric Haszlakiewicz
2012-04-03 14:54:25 -05:00
7f3298da85
Remove the "#undef PRINTBUF_DEBUG" from printbuf.h so it can be more easily turned on in the Makefile.
Eric Haszlakiewicz
2012-04-03 14:48:15 -05:00
8310d3634c
Add a printbuf_memset() function to provide an effecient way to set and append things like whitespace indentation.
Eric Haszlakiewicz
2012-04-02 15:39:55 -05:00
0d79b53456
Fix some bugs with how buffer sizes were being calcuated in printbuf_memset and an off-by-one error in printbuf_memappend.
Eric Haszlakiewicz
2012-04-03 14:54:25 -05:00
61a154e58b
Remove the "#undef PRINTBUF_DEBUG" from printbuf.h so it can be more easily turned on in the Makefile.
Eric Haszlakiewicz
2012-04-03 14:48:15 -05:00
2d48543f2e
Add a printbuf_memset() function to provide an effecient way to set and append things like whitespace indentation.
Eric Haszlakiewicz
2012-04-02 15:39:55 -05:00
2b5929bb13
Direct people to send bug reports to the json-c google group.
Eric Haszlakiewicz
2012-03-31 23:17:31 -05:00
a7bd85caba
Remove a few more things in the distclean target to get rid of *all* generated files.
Eric Haszlakiewicz
2012-03-31 23:17:00 -05:00
f30a9ace77
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.
Eric Haszlakiewicz
2012-03-31 22:53:43 -05:00
30c6c4a1be
Split the json_tokener_parse tests off from test1 into their own test and add several more cases to check various incremental parsing situations.
Eric Haszlakiewicz
2012-03-31 22:51:39 -05:00
bb7978c95f
For the prototype for json_tokener_error_desc().
Eric Haszlakiewicz
2012-03-31 22:49:58 -05:00
23d0da5870
Mention json_type_to_name() in the docs for json_object_get_type().
Eric Haszlakiewicz
2012-03-31 22:47:47 -05:00
7c4a964002
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.
Eric Haszlakiewicz
2012-03-31 17:33:58 -05:00
e6668b1406
Adjust json_object_is_type and json_object_get_type so they return json_type_null for NULL objects.
Eric Haszlakiewicz
2012-03-31 13:47:28 -05:00
d7db7e81a5
Ignore several more files, include .o's, .lo's, etc...
Eric Haszlakiewicz
2012-03-31 12:55:52 -05:00
9885b30c0e
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/)
Eric Haszlakiewicz
2012-03-31 12:52:59 -05:00
781798ccdf
Direct people to send bug reports to the json-c google group.
Eric Haszlakiewicz
2012-03-31 23:17:31 -05:00
fbd207bd6b
Remove a few more things in the distclean target to get rid of *all* generated files.
Eric Haszlakiewicz
2012-03-31 23:17:00 -05:00
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.
Eric Haszlakiewicz
2012-03-31 22:53:43 -05:00
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.
Eric Haszlakiewicz
2012-03-31 22:51:39 -05:00
1489b081a7
For the prototype for json_tokener_error_desc().
Eric Haszlakiewicz
2012-03-31 22:49:58 -05:00
6ff0817bac
Mention json_type_to_name() in the docs for json_object_get_type().
Eric Haszlakiewicz
2012-03-31 22:47:47 -05:00
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.
Eric Haszlakiewicz
2012-03-31 17:33:58 -05:00
aef439a175
Adjust json_object_is_type and json_object_get_type so they return json_type_null for NULL objects.
Eric Haszlakiewicz
2012-03-31 13:47:28 -05:00
7e57d63aeb
Merge pull request #16 from kdopen/master
Eric Haszlakiewicz
2012-03-31 11:12:20 -07:00
d3c37b82a6
Ignore several more files, include .o's, .lo's, etc...
Eric Haszlakiewicz
2012-03-31 12:55:52 -05:00
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/)
Eric Haszlakiewicz
2012-03-31 12:52:59 -05:00
37e7467476
Rename boolean type to json_bool
Keith Derrick
2012-03-26 14:29:31 -07:00
Eric Haszlakiewicz