summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Reformat the json_object-split branch with clang-formatjson_object-splitEric Haszlakiewicz2020-06-162-39/+32
|
* Include unistd.h to fix the build on OSXEric Haszlakiewicz2020-06-142-0/+5
|
* Drop the _delete field from struct json_object and call the type-specific ↵Eric Haszlakiewicz2020-06-132-19/+30
| | | | delete functions directly from json_object_put. (Thanks @dota17 for the suggestion in PR #632!)
* Drop the useless "char data[1]" from struct json_object. Fix a typo in a ↵Eric Haszlakiewicz2020-06-132-2/+3
| | | | comment.
* Eliminate unnecessary cast that was added to test_double_serializer.Eric Haszlakiewicz2020-06-071-1/+1
|
* Summarize the changes from the json_object-split branch in the ChangeLog.Eric Haszlakiewicz2020-06-071-0/+7
|
* Move the ssize_t typedef from json_inttypes.h to json_object_private.h so as ↵Eric Haszlakiewicz2020-06-072-5/+5
| | | | not to affect publically exposed symbols.
* The split of json_object into type-specific sub-structures is now ↵Eric Haszlakiewicz2020-06-075-433/+89
| | | | | | functionally complete. Remove all of the temporary defines, structures, old compat fuctions, extra fields, etc... that were needed during the conversion to a split set of json_object_* structures.
* More fixes for old MSVC builds.Eric Haszlakiewicz2020-06-071-5/+5
|
* Fix typo in previous commit to check for SSIZE_T on MSVC.Eric Haszlakiewicz2020-06-071-2/+2
|
* Change CMakeLists.txt to look for SSIZE_T on MSVC too.Eric Haszlakiewicz2020-06-071-0/+5
|
* On MSVC, add a ssize_t typedef using SSIZE_T from BaseTsd.hEric Haszlakiewicz2020-06-071-0/+5
|
* Kick json_type_string out of struct json_object.Eric Haszlakiewicz2020-06-075-109/+162
| | | | | The default is now that string data is stored inline at the end of json_object, though to allow for json_object_set_string() to set a _longer_ string, we still need to allow for the possibility of a separate char * pointer. All json types have been split out now, next step it cleanup.
* Kick json_type_int and json_type_double out of struct json_object.Eric Haszlakiewicz2020-05-263-147/+172
| | | | Clean up the code in json_object_new_* a bit by dropping unnecesary json_object_base variables.
* Declare variables earlier, to appease Visual Studio 2010.Eric Haszlakiewicz2020-05-251-3/+6
|
* Kick json_type_boolean out of struct json_object.Eric Haszlakiewicz2020-05-252-16/+36
|
* Add some backwards compat for Visual Studio 2013.Eric Haszlakiewicz2020-05-251-0/+5
|
* Kick json_type_array out of struct json_object; re-enable the test_deep_copy ↵Eric Haszlakiewicz2020-05-253-31/+82
| | | | test.
* Start splitting struct json_object into multiple sub-types, as descibed at ↵Eric Haszlakiewicz2020-05-255-52/+406
| | | | | | | | | | | | https://github.com/json-c/json-c/wiki/Proposal:-struct-json_object-split The current changes split out _only_ json_type_object, and thus have a number of hacks to allow the code to continue to build and work. Originally mentioned in issue #535. When complete, this will probably invalidate #552. This is likely to cause notable conflicts in any other significant un-merged changes, such as PR#620.
* In arraylist, use malloc instead of calloc, avoid clearing with memeset ↵Eric Haszlakiewicz2020-05-241-4/+25
| | | | until we really need to, and micro-optimize array_list_add().
* Merge pull request #622 from besser82/topic/besser82/doc_subdirEric Hawicz2020-05-184-22/+21
|\ | | | | doc: Move Doxyfile into doc subdir.
| * CMake: Fix grammar: written -> wrote.Björn Esser2020-05-181-2/+2
| |
| * doc: Move Doxyfile into doc subdirBjörn Esser2020-05-184-20/+19
|/
* With the change in cc80203, Doxyfile no longer needs to be updated for a ↵Eric Haszlakiewicz2020-05-181-2/+0
| | | | release.
* Merge pull request #619 from besser82/topic/besser82/doxygen_ootEric Hawicz2020-05-182-6/+7
|\ | | | | CMake: Fix out-of-tree build for Doxygen documentation.
| * CMake: Fix out-of-tree build for Doxygen documentation.Björn Esser2020-05-182-6/+7
| |
* | Merge pull request #618 from besser82/topic/besser82/test_deep_copyEric Hawicz2020-05-181-1/+1
|\ \ | |/ |/| test_deep_copy: Fix assertion value.
| * test_deep_copy: Fix assertion value.Björn Esser2020-05-181-1/+1
|/
* Merge pull request #617 from besser82/topic/besser82/option_disable_tlsEric Hawicz2020-05-183-21/+26
|\ | | | | Add an option to disable the use of thread-local storage.
| * README: Update configuration options for CMake.Björn Esser2020-05-181-10/+11
| |
| * CMake: Re-format config-option block and re-order it alphabetically.Björn Esser2020-05-181-5/+5
| |
| * CMake: Add an option to disable the use of thread-local storage.Björn Esser2020-05-181-7/+10
| | | | | | | | | | | | | | | | Using thread-local storage may not be desired in all environments and/or use-cases, thus there should be an option to disable its use on purpose. Fixes #451.
| * tests: Fix test_double_serializer without thread-local storage.Björn Esser2020-05-181-0/+1
|/
* Merge pull request #614 from stoeckmann/formatEric Hawicz2020-05-163-2/+17
|\ | | | | Prevent truncation on custom double formatters.
| * Prevent truncation on custom double formatters.Tobias Stoeckmann2020-05-163-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A custom double formatter can lead to truncation of the rest of the JSON document. If a custom formatter completely fills the buffer used by snprintf with a trailing dot or comma and the formatting option JSON_C_TO_STRING_NOZERO has been specified, then an iterator moves past the ending '\0' (off-by-one buffer overflow) to set an additional '\0' and adds the first '\0' into the printbuf. Since '\0' will eventually be considered the terminating character of the complete printbuf result, all trailing characters are lost. This leads to an incomplete JSON string as can be seen with the test case. The off-by-one can be noticed if compiled with address sanitizer. Since this is a very special case and a malformed formatter could do way more harm and is the responsibility of the user of this library, this is just a protective measure to keep json-c code as robust as possible.
* | Update issue templatesEric Hawicz2020-05-161-0/+23
|/
* Revert part of PR#606 and use isnan/isinf again, but provide macro ↵Eric Haszlakiewicz2020-05-162-6/+8
| | | | implementations of those in math_compat.h is needed, as it seems to be on AIX and IBM i systems.
* Merge pull request #606 from davidjmccann/masterEric Hawicz2020-05-158-11/+39
|\ | | | | Improved support for IBM operating systems
| * Improved support for IBM operating systemsDavid McCann2020-05-148-11/+39
| | | | | | | | Fix compiler errors and warnings when building on IBM operating systems such as AIX and IBM i.
* | Issue #604: add check for __MINGW32__ in snprintf_compat.hEric Haszlakiewicz2020-05-131-1/+1
| |
* | Display a bit of info about what exactly we're benchmarking.Eric Haszlakiewicz2020-05-111-0/+11
| |
* | Ignore the bench/work and bench/data directories.Eric Haszlakiewicz2020-05-111-0/+4
|/
* Merge pull request #602 from ploxiln/parse_uint64_errnoEric Hawicz2020-05-103-9/+8
|\ | | | | fix json_parse_uint64() usage of errno
| * fix json_parse_uint64() usage of errnoPierce Lopez2020-05-103-9/+8
|/ | | | | introduced in #542 fixes #601
* Fix snprintf on windows problem for test4.Eric Haszlakiewicz2020-05-101-0/+1
|
* Issue #600: don't rename the static library on Windows, it _needs_ to have a ↵Eric Haszlakiewicz2020-05-101-0/+2
| | | | different name because the dll build also creates a "json-c.lib" file.
* Re-format after recent change to fix linkhash.Eric Haszlakiewicz2020-05-102-3/+3
|
* Issue #598: avoid building static libraries twice.Eric Haszlakiewicz2020-05-101-1/+1
|
* Issue #599: Fix the backwards check in lh_table_insert_w_hash() that was ↵Eric Haszlakiewicz2020-05-103-1/+31
| | | | | | preventing adding more than 11 objects. Add a test to check for this too.
* Merge branch 'master' of https://github.com/json-c/json-cEric Hawicz2020-05-089-38/+173
|\
View Lorry Controller Status