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

1041 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
andy5995
e2f46b9f79 partial revert (make use) [skip ci] 2019-07-25 22:55:07 -05:00
Eric Haszlakiewicz
68abf12afa Issue #498: Fix a memory leak bug introduced in test_double_serializer in 485f2a02 by adding a json_object_put call. 2019-07-26 03:35:38 +00:00
Eric Haszlakiewicz
48984dbd42 Merge pull request #496 from andy5995/pointer_doc 
json_pointer.h:suggest minor grammar improvement for pointer doc
 2019-07-25 22:58:22 -04:00
andy5995
8ab8df1170 test/Makefile.am:add missing deps for test1 and test2 
Allows the tests to pass when running `make distcheck`

This fixes the 2 broken tests I mentioned at
https://github.com/json-c/json-c/pull/499#discussion_r306998261
 2019-07-25 14:59:56 -05:00
andy5995
a9c34d5531 json_pointer.h:suggest minor grammar improvement for pointer doc 2019-07-23 23:53:06 -05:00
andy5995
3969487376 README.md:fix 2 typos 2019-07-23 23:43:59 -05:00
Eric Haszlakiewicz
07ea04e651 Merge pull request #491 from ploxiln/disable_werror 
build: add option --disable-werror to configure
 2019-06-09 14:05:46 -04:00
Pierce Lopez
634900d270 tests: appease -Wwrite-strings 2019-06-09 12:17:06 -04:00
Pierce Lopez
44605744dc build: fix compiler option -Wwrite-strings 
was typod as -Wwrite-string
 2019-06-09 10:55:50 -04:00
Pierce Lopez
21c886534f build: add --disable-werror option to configure 
to omit -Werror compiler option
 2019-06-09 10:53:56 -04:00
Eric Haszlakiewicz
2b1903cc69 Merge pull request #485 from myd7349/fix-cmake-module 
Install CMake module files
 2019-05-30 22:38:29 -04:00
Eric Haszlakiewicz
485f2a02c7 Issue #486: append a missing ".0" to negative double values too. 2019-05-28 02:44:22 +00:00
myd7349
c2036ab9fc Install CMake module files 2019-05-18 19:44:29 +08:00
Eric Haszlakiewicz
3e81b4abe3 Merge pull request #474 from Jehan/fix-pc-file-cmake 
Installation directories empty with CMake in pkg-config.
 2019-01-26 10:55:50 -05:00
Jehan
c46a0636c6 Installation directories empty with CMake in pkg-config. 
CMake was not properly substituting the installation dir variables (they
ended up all empty), so the pkg-config results were also wrongs. For
instance cflags was: -I -I/json-c
Even though json-c was found at configure time, this obviously broke the
build of any application using it.
 2019-01-26 12:30:40 +01:00
Eric Haszlakiewicz
f1713b3f62 Merge pull request #473 from besser82/fixup/docs_utf8 
Convert ChangeLog to valid UTF-8 encoding.
 2019-01-23 22:47:27 -05:00
Björn Esser
259d5078c4 Clean trailing white-spaces in ChangeLog. 2019-01-22 17:07:14 +01:00
Björn Esser
6b0745ea1f Convert ChangeLog to valid UTF-8 encoding. 2019-01-22 17:07:14 +01:00
Eric Haszlakiewicz
39c9fa0a2b Merge pull request #468 from rkalidas/compiler-fixes 
Fix compiler warnings
 2018-12-19 11:09:01 -05:00
Rubasri Kalidas
3003161eff Fix compiler warnings 2018-12-18 11:30:57 -06:00
Eric Haszlakiewicz
6460446aa6 Switch to building a dynamic lib by default. Tweak language in the README.md slightly. Inspired by PR#452. 2018-12-11 20:59:08 -05:00
Eric Haszlakiewicz
ee4691c9fb Merge pull request #453 from darjankrijan/master 
Fixed misalignment in JSON string due to space after \n being printed...
 2018-12-11 20:17:43 -05:00
Darjan Krijan
9c4b07faec Removed newly created test case and incorporated it into test1.test and test2.test 2018-12-07 17:39:59 +01:00
Darjan Krijan
7a9075c16b Added test cases for spaced pretty and pretty_tab used together 2018-12-07 17:30:15 +01:00
Eric Haszlakiewicz
240627f260 Merge pull request #454 from ramiropolla/json_object_private 
json_object_private: save 8 bytes in struct json_object in 64-bit arc…
 2018-11-30 09:49:35 -05:00
Eric Haszlakiewicz
745cadc944 Merge pull request #461 from andy5995/issue_422 
json_object.c:set errno in json_object_get_double()
 2018-11-28 20:39:42 -05:00
Eric Haszlakiewicz
83cb93b7ae Merge pull request #462 from andy5995/issue_460 
json_object.h:document json_object_new_string_len()
 2018-11-28 20:39:13 -05:00
andy5995
2942870325 remove [in] from params description 
Keeping this would be inconsistent with the other documentation
 2018-11-28 16:55:19 -06:00
andy5995
3b108935d0 json_object.h:document json_object_new_string_len() 
I also added a couple trivial, but related, suggestions.

closes #460
 2018-11-27 11:35:45 -06:00
andy5995
506a32d4ab json_object.c:set errno in json_object_get_double() 
closes #422
 2018-11-26 21:12:06 -06:00
Eric Haszlakiewicz
7539ab2d2e Merge pull request #459 from andy5995/issue_438 
README.html:fix link to Doxygen docs, remove WIN32 link
 2018-11-25 21:19:02 -05:00
Eric Haszlakiewicz
753de5a5a9 Merge pull request #458 from andy5995/README_files_link 
README.md:fix dead "file.html" link
 2018-11-25 21:17:40 -05:00
Eric Haszlakiewicz
80bf857b27 Merge pull request #457 from andy5995/gitignore_build 
.gitignore:add build directory
 2018-11-25 21:14:34 -05:00
Eric Haszlakiewicz
aa831c7960 Merge pull request #456 from andy5995/style_perms 
STYLE.txt:remove executable permissions
 2018-11-25 21:14:14 -05:00
andy5995
fc1b113b29 README.html:fix link to Doxygen docs, remove WIN32 link 
fixes #438
[skip ci]
 2018-11-25 07:09:00 -06:00
andy5995
71f5c2d50b README.md:fix dead "file.html" link 2018-11-25 06:51:21 -06:00
andy5995
c3e11d6812 .gitignore:add build directory 2018-11-25 06:45:21 -06:00
andy5995
dba65cbd30 STYLE.txt:remove executable permissions 2018-11-25 06:43:02 -06:00
Ramiro Polla
5bb5e2e8fc json_object_private: save 8 bytes in struct json_object in 64-bit architectures 
- there is no need for _ref_count to be uint_fast32_t (the compiler
  might decide to use a 64-bit int). make it uint32_t instead.
- reorder the 32-bit integer fields (o_type and _ref_count) so that
  there is no wasted 4-byte gap after each of them.
 2018-11-24 04:16:36 +01:00
Darjan Krijan
b0bceaa8bf Added a test for the space after \n issue with flags=JSON_C_TO_STRING_SPACED|JSON_C_TO_STRING_PRETTY|(JSON_C_TO_STRING_PRETTY_TAB) used in json_object_array_to_json_string 2018-11-21 22:41:13 +01:00
Darjan Krijan
3943960874 Removed spaces after \n for arrays as well 2018-11-21 22:34:01 +01:00
Darjan Krijan
e8cec5c9e4 Fixed misalignment in JSON string due to space after \n being printed when choosing JSON_C_TO_STRING_SPACED together with JSON_C_TO_STRING_PRETTY in json_object_array_to_json_string 2018-11-20 22:21:27 +01:00
Eric Haszlakiewicz
ebe520e96e Merge pull request #450 from drizt/subproject 
Allow use json-c cmake as subproject
 2018-10-20 23:01:20 -04:00
Ivan Romanov
ba5a02e8a9 Allow use json-c cmake as subproject 
Now json-c can be bundled to any cmake-based project and used with
couple lines of code:

add_subdirectory(json-c EXCLUDE_FROM_ALL)
target_link_libraries(MyProject json-c)
 2018-10-20 10:50:15 +05:00
Eric Haszlakiewicz
994e6c1f60 Re-add creation and installation of the json-c.pc file to the cmake build. 2018-09-01 15:06:14 -04:00
Eric Haszlakiewicz
705e2fd010 Merge pull request #444 from Hawk777/document-ref-count-tokener 
Document refcount of json_tokener_parse_ex return
 2018-08-31 01:16:53 -04:00
Christopher Head
31d4d3dee7 Document refcount of json_tokener_parse_ex return 2018-08-30 09:18:29 -07:00
Eric Haszlakiewicz
0a8ac2ed92 Merge pull request #441 from changyongGuo/c_flag_error 
fix c flag loss during cmake building
 2018-08-14 20:40:49 -04:00
changyong guo
08c8231cc8 fix c flag loss during cmake building 2018-08-14 13:52:18 +08:00
Eric Haszlakiewicz
bf29aa0f8c Merge pull request #434 from unmanned-player/devel 
The real CMake support
 2018-07-28 11:59:46 -04:00