Eric Haszlakiewicz
48984dbd42
Merge pull request #496 from andy5995/pointer_doc
json_pointer.h:suggest minor grammar improvement for pointer doc
6 years ago
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
6 years ago
andy5995
a9c34d5531
json_pointer.h:suggest minor grammar improvement for pointer doc
6 years ago
andy5995
3969487376
README.md:fix 2 typos
6 years ago
Eric Haszlakiewicz
07ea04e651
Merge pull request #491 from ploxiln/disable_werror
build: add option --disable-werror to configure
6 years ago
Pierce Lopez
634900d270
tests: appease -Wwrite-strings
6 years ago
Pierce Lopez
44605744dc
build: fix compiler option -Wwrite-strings
was typod as -Wwrite-string
6 years ago
Pierce Lopez
21c886534f
build: add --disable-werror option to configure
to omit -Werror compiler option
6 years ago
Eric Haszlakiewicz
2b1903cc69
Merge pull request #485 from myd7349/fix-cmake-module
Install CMake module files
6 years ago
Eric Haszlakiewicz
485f2a02c7
Issue #486 : append a missing ".0" to negative double values too.
6 years ago
myd7349
c2036ab9fc
Install CMake module files
6 years ago
Eric Haszlakiewicz
3e81b4abe3
Merge pull request #474 from Jehan/fix-pc-file-cmake
Installation directories empty with CMake in pkg-config.
6 years ago
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.
6 years ago
Eric Haszlakiewicz
f1713b3f62
Merge pull request #473 from besser82/fixup/docs_utf8
Convert ChangeLog to valid UTF-8 encoding.
6 years ago
Björn Esser
259d5078c4
Clean trailing white-spaces in ChangeLog.
6 years ago
Björn Esser
6b0745ea1f
Convert ChangeLog to valid UTF-8 encoding.
6 years ago
Ramiro Polla
38a112380b
json_object: cleanup of *set_string* functions
This commit also has the side-effect that errno is set on failed calls
to json_object_set_string(_len).
7 years ago
Ramiro Polla
906188e1cf
json_object: speed up creation of objects
Instead of using calloc(), call malloc() and initialize the relevant
fields individually.
speedup for 32-bit: ~15%
speedup for 64-bit: ~ 5%
7 years ago
Ramiro Polla
c9a0ac5886
json_tokener: optimize parsing of integer values
speedup for 32-bit: ~8%
speedup for 64-bit: ~9%
7 years ago
Ramiro Polla
d98fc501fb
json_tokener: optimize check for number characters
speedup for 32-bit: ~5%
speedup for 64-bit: ~3%
7 years ago
Ramiro Polla
45c601bfa4
json_tokener: optimize check for hex characters
speedup for 32-bit: ~1%
speedup for 64-bit: ~1%
7 years ago
Ramiro Polla
158c248d5c
json_tokener: optimize check for whitespace characters
speedup for 32-bit: ~15%
speedup for 64-bit: ~ 2%
7 years ago
Ramiro Polla
ab3e40b37c
json_object_deep_copy: fix deep copy of strings containing '\0'
7 years ago
Ramiro Polla
1f46d2f40f
json_object_private: remove _delete field
This field is set based on o_type when the object is created and it is
not changed during the lifetime of the object. Therefore we can check
o_type to choose the proper delete function in json_object_put(), and
save sizeof(void *) bytes in struct json_object_private.
7 years ago
Eric Haszlakiewicz
39c9fa0a2b
Merge pull request #468 from rkalidas/compiler-fixes
Fix compiler warnings
7 years ago
Rubasri Kalidas
3003161eff
Fix compiler warnings
7 years ago
Eric Haszlakiewicz
6460446aa6
Switch to building a dynamic lib by default. Tweak language in the README.md slightly. Inspired by PR#452.
7 years ago
Eric Haszlakiewicz
ee4691c9fb
Merge pull request #453 from darjankrijan/master
Fixed misalignment in JSON string due to space after \n being printed...
7 years ago
Darjan Krijan
9c4b07faec
Removed newly created test case and incorporated it into test1.test and test2.test
7 years ago
Darjan Krijan
7a9075c16b
Added test cases for spaced pretty and pretty_tab used together
7 years ago
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…
7 years ago
Eric Haszlakiewicz
745cadc944
Merge pull request #461 from andy5995/issue_422
json_object.c:set errno in json_object_get_double()
7 years ago
Eric Haszlakiewicz
83cb93b7ae
Merge pull request #462 from andy5995/issue_460
json_object.h:document json_object_new_string_len()
7 years ago
andy5995
2942870325
remove [in] from params description
Keeping this would be inconsistent with the other documentation
7 years ago
andy5995
3b108935d0
json_object.h:document json_object_new_string_len()
I also added a couple trivial, but related, suggestions.
closes #460
7 years ago
andy5995
506a32d4ab
json_object.c:set errno in json_object_get_double()
closes #422
7 years ago
Eric Haszlakiewicz
7539ab2d2e
Merge pull request #459 from andy5995/issue_438
README.html:fix link to Doxygen docs, remove WIN32 link
7 years ago
Eric Haszlakiewicz
753de5a5a9
Merge pull request #458 from andy5995/README_files_link
README.md:fix dead "file.html" link
7 years ago
Eric Haszlakiewicz
80bf857b27
Merge pull request #457 from andy5995/gitignore_build
.gitignore:add build directory
7 years ago
Eric Haszlakiewicz
aa831c7960
Merge pull request #456 from andy5995/style_perms
STYLE.txt:remove executable permissions
7 years ago
andy5995
fc1b113b29
README.html:fix link to Doxygen docs, remove WIN32 link
fixes #438
[skip ci]
7 years ago
andy5995
71f5c2d50b
README.md:fix dead "file.html" link
7 years ago
andy5995
c3e11d6812
.gitignore:add build directory
7 years ago
andy5995
dba65cbd30
STYLE.txt:remove executable permissions
7 years ago
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.
7 years ago
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
7 years ago
Darjan Krijan
3943960874
Removed spaces after \n for arrays as well
7 years ago
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
7 years ago
Eric Haszlakiewicz
ebe520e96e
Merge pull request #450 from drizt/subproject
Allow use json-c cmake as subproject
7 years ago
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)
7 years ago