Commit Graph

282 Commits

Author SHA1 Message Date
Thomas Gstädtner
36ec47db49 configure.in: mv AM_CONFIG_HEADER to AC_CONFIG_HEADER
the former has been deprecated and does not work on newer autoconf
versions.
2013-03-03 00:36:32 +01:00
Eric Haszlakiewicz
94aeed2ecd Include the test_locale test in the tests that run. 2013-02-26 21:14:07 -06:00
Eric Haszlakiewicz
5b36a432c8 Merge branch 'remicollet-issue-float'
Conflicts:
	json_util.c
2013-02-26 21:09:10 -06:00
Eric Haszlakiewicz
9b64c05ff9 Mark the "val" variable in json_object_object_foreach as unused so the compiler doesn't complain. Fix warnings in the testReplaceExisting test. 2013-02-21 12:32:29 -06:00
Eric Haszlakiewicz
bfb329223a Add a runtime check to see if parse_int64 needs to workaround sscanf bugs. If that workaround is not needed parsing is nearly twice as fast. 2013-02-09 17:35:33 -06:00
Eric Haszlakiewicz
ca8b27d183 Enable -Werror and fix a number of minor warnings that existed. 2013-02-09 16:35:24 -06:00
Eric Haszlakiewicz
92d289f5d3 Add a comment briefly describing json_object_object_length() 2013-02-09 16:18:05 -06:00
Eric Haszlakiewicz
c6b399194d Merge pull request #62 from ghazel/master
json_object_object_length
2013-02-09 14:14:33 -08:00
Eric Haszlakiewicz
ebeb6a40c9 Merge pull request #66 from ichernev/fix-test-parse
Fixed test_parse for \f
2013-02-09 13:59:51 -08:00
Iskren Chernev
78b089bc1e Fixed test_parse for \f 2013-01-28 19:06:49 -08:00
Greg Hazel
cca74c6de6 add json_object_object_length 2013-01-11 01:36:55 -08:00
Eric Haszlakiewicz
3ae296f694 Merge pull request #60 from ghazel/master
rename _errno
2013-01-09 15:26:42 -08:00
Greg Hazel
77d0493b70 rename _errno 2013-01-03 16:54:04 -08:00
Eric Haszlakiewicz
85da28c534 Merge pull request #58 from Abioy/master
escape '\f' in json_escape_str
2013-01-02 10:08:44 -08:00
Abioy
7eaa849e9a escape '\f' in json_escape_str
'\f' is a llegal char and should be escape in printbuf
2012-12-24 22:22:05 +08:00
Eric Haszlakiewicz
fcc768e667 Bump the version up to 0.10.99 to make it clear that the master branch is beyond anything on the 0.10 branch. 2012-12-23 11:09:20 -06:00
Eric Haszlakiewicz
2943691181 Merge branch 'master' of https://github.com/json-c/json-c 2012-12-23 10:59:52 -06:00
Eric Haszlakiewicz
1461b49385 Add a json_c_version.h header (included from json.h), and several macros and functions for retrieving the json-c version at compile-time and run-time. 2012-12-23 10:57:44 -06:00
Eric Haszlakiewicz
56166e2dff Merge pull request #51 from remicollet/issue-dyndepth
Make maximum recursion depth a runtime option
2012-12-23 08:39:46 -08:00
Eric Haszlakiewicz
d7de3aa24b Update the release checklist to include the INSTALL file, and adjust the git command to add the doc directory. 2012-12-23 10:27:14 -06:00
Eric Haszlakiewicz
2e9fef38c2 Revert the test_null test back to emitted to stdout, and update the expected output to match. 2012-12-23 10:25:03 -06:00
Eric Haszlakiewicz
86aedc2d2a Merge pull request #56 from TheCount/develop
Some houskeeping
2012-12-23 08:23:13 -08:00
Alexander Klauer
18abf6e509 More warnings, fewer errors, C99 2012-12-19 13:55:02 +01:00
Alexander Klauer
024d86c07f Prepend DESTDIR to paths for staged installs 2012-12-19 13:16:38 +01:00
Alexander Klauer
57f36ed32a Write additional test info to stderr instead of stdout so as not to mar the expected output 2012-12-19 10:52:50 +01:00
Alexander Klauer
827a4a97b9 Fixed memory leak in testReplaceExisting 2012-12-19 10:46:35 +01:00
Alexander Klauer
beb12d49e1 Make macro json_object_object_foreach multiple-use safe 2012-12-19 10:31:39 +01:00
Alexander Klauer
20ef1bd980 Remove and ignore autogenerated installation instructions 2012-12-19 09:40:10 +01:00
Alexander Klauer
8f58f09c69 Ignore editor swap files 2012-12-19 09:38:45 +01:00
Alexander Klauer
54d551c810 Ignore doc dir for now 2012-12-18 18:53:04 +01:00
Alexander Klauer
b1d61d10e1 Library is now called libjson-c 2012-12-18 18:46:24 +01:00
Alexander Klauer
a3a0f5b28d Need to explicitly remove include/json-c directory 2012-12-18 18:45:39 +01:00
Alexander Klauer
b670f6f992 -d test is useless as symlinks are dereferenced 2012-12-18 18:44:52 +01:00
Alexander Klauer
e176965c1c Ignore valgrind output files 2012-12-18 18:27:39 +01:00
Remi Collet
32d149c8f6 probably worth an option for this 2012-12-13 11:46:04 +01:00
Remi Collet
8c847968c7 Save space, drop unuseful trailing zeroes 2012-12-13 11:22:31 +01:00
Remi Collet
4014fe86d9 Simple fix to double encode 2012-12-13 11:16:03 +01:00
Remi Collet
a01b659ace move locale change to be global for perf 2012-12-13 09:47:33 +01:00
Eric Haszlakiewicz
4e4af93d66 Fix issue #53 - ensure explicit length string are still NUL terminated, and fix json_tokener_parse() to work properly with embedded unicode \u0000 values in strings.
Adjust test_null to check for this case.
See also http://bugs.debian.org/687269
2012-12-09 16:32:11 -06:00
Eric Haszlakiewicz
7a4506d6df Remove configure as part of maintainer-clean instead of distclean. Addresses issue #48. 2012-12-09 15:46:35 -06:00
Eric Haszlakiewicz
7653d4952a Add PACKAGE_URL to config.h.in 2012-12-09 15:46:23 -06:00
Eric Haszlakiewicz
aec876357c Add a missing json_object_get() so we don't try to use a freed object in test1. 2012-11-29 15:06:17 -05:00
Eric Haszlakiewicz
447b88a115 Fix a memory leak in the test_printbuf test. 2012-11-29 13:29:55 -06:00
Eric Haszlakiewicz
23461c75dd Include json_object_iterator.c in the list of sources. 2012-11-29 13:23:06 -06:00
Remi Collet
16a4a32e29 float parsing must be locale independent 2012-11-27 11:06:49 +01:00
Remi Collet
197cb1d1c1 Make maximum recursion depth a runtime option 2012-11-27 09:01:45 +01:00
Eric Haszlakiewicz
f6b27cbb6c Make it safe to delete keys while iterating with the json_object_object_foreach macro. 2012-10-20 20:26:37 -05:00
Eric Haszlakiewicz
5abc0ea444 Reformat the json_object_object_foreach macro so it is readable, and document what is allowed to be done with the object while iterating. 2012-10-20 20:10:15 -05:00
Eric Haszlakiewicz
e36e562872 Reformat json_object_object_get() and json_object_object_get_ex(). 2012-10-18 17:16:36 -05:00
Eric Haszlakiewicz
5450bed051 Fix json_object_object_get() so it returns NULL if the incoming json_object is NULL. 2012-10-18 17:14:41 -05:00