mirror/json-c
1
0
Fork 0
mirror of https://github.com/json-c/json-c.git synced 2026-03-21 14:09:06 +08:00
Code Issues Packages Projects Releases Wiki Activity
245 Commits 14 Branches 11 Tags
20db5a4e848bbc8e0bf79ebea17a7eef9988c785
Commit Graph

245 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Haszlakiewicz
20db5a4e84 Fill in a number of missing steps in the release process. 2013-04-02 21:21:38 -05:00
Eric Haszlakiewicz
7ca1e523f0 Merge branch 'master' of https://github.com/json-c/json-c 2013-03-31 20:58:54 -05:00
Eric Haszlakiewicz
0e81b21dc8 Bump up the version in the release checklist to 0.11 2013-03-31 20:58:30 -05:00
Eric Haszlakiewicz
eee744cd7e Update the changelog with changes since the 0.10 release. 2013-03-31 20:57:08 -05:00
Eric Haszlakiewicz
f1b684971d Update config.h.in to add the HAVE_SETLOCALE and HAVE_LOCALE_H lines. 2013-03-31 20:34:28 -05:00
Eric Haszlakiewicz
e8161a11bb Issue #15: add a way to set a JSON_TOKENER_STRICT flag to forbid commas at the end of arrays and objects. 2013-03-31 20:05:36 -05:00
Eric Haszlakiewicz
889400d946 Merge pull request #73 from ghazel/master 
one definition of json_object_object_foreach only works on c99 and later
 2013-03-23 17:06:03 -07:00
Greg Hazel
88bf1c9960 one definition of json_object_object_foreach only works on c99 and later 2013-03-19 16:26:12 -07:00
Eric Haszlakiewicz
5ec65e43b2 Merge pull request #71 from WillDignazio/master 
Fix Broken Build, Check ADVANCE_CHAR
 2013-03-15 21:19:48 -07:00
William Dignazio
32eddd66f5 Fix broken build by using ADVANCE_CHAR macro return. 
We forget to check or use the return value of the ADVANCE_CHAR macro,
and upon compilation an error is thrown because of its lack of use. This
patch checks to see if the macro was successful, and if not replaces the
offending character with a replacement.
 2013-03-06 20:18:14 -05:00
William Dignazio
bb492d4d69 Rename misnomer POP_CHAR to PEEK_CHAR. 
While parsing token data, we use the POP_CHAR macro to 'peek' at
character data. This behaviour is noted in the comments for the macro,
yet the definition is left as 'pop'. Changing to PEEK_CHAR does not
imply that the character being observed is removed.
 2013-03-06 12:29:33 -05:00
Eric Haszlakiewicz
b64d5ab966 Merge pull request #70 from tg--/master 
rename AM_CONFIG_HEADER to AC_CONFIG_HEADER
 2013-03-03 20:34:34 -08:00
Eric Haszlakiewicz
1aa29b655a Issue #68: use -std=gnu99 because some versions of gcc seem to think that -std=c99 also implies -ansi, which causes warnings and build breakage. 2013-03-03 22:26:28 -06:00
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