summaryrefslogtreecommitdiff
path: root/json_object.h
Commit message (Collapse)AuthorAgeFilesLines
* The split of json_object into type-specific sub-structures is now ↵Eric Haszlakiewicz2020-06-071-2/+1
| | | | | | 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.
* Start splitting struct json_object into multiple sub-types, as descibed at ↵Eric Haszlakiewicz2020-05-251-1/+2
| | | | | | | | | | | | 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.
* Enforce strict prototypes.Björn Esser2020-04-131-1/+1
|
* Clean trailing white-space.Björn Esser2020-04-111-14/+14
|
* Add includes and split off json_types.h to help ensure that headers can be ↵Eric Haszlakiewicz2020-04-061-52/+2
| | | | included in any order.
* clang-format the filesdota172020-04-031-128/+114
|
* update json_object.c and testcase, delete json_object_uint_inc()dota172020-02-281-14/+0
|
* modify partial functions and testcase, in order to support automatic ↵dota172020-02-281-6/+0
| | | | conversion for int64/uint64
* modify the json_object, replace c_int64/c_uint64 with struct{union{int64, ↵dota172020-02-271-3/+6
| | | | uint64},...}
* add uint64 data to json-cdota172020-02-251-0/+49
|
* Issue #539: use a internal-only serializer function in ↵Eric Haszlakiewicz2020-02-141-1/+5
| | | | json_object_new_double_s() to avoid potential conflicts with user code that uses the json_object_userdata_to_json_string serializer. Also, document the serializer-resetting behavior of json_object_set_double().
* update commentdota172020-01-221-2/+3
|
* add json_object_new_nulldota172020-01-201-0/+5
|
* Fix some Windows compile issues, add JSON_EXPORT's, fix bogus character ↵Eric Haszlakiewicz2019-11-231-4/+4
| | | | escapes, define __func__ and omit unistd.h if needed.
* Issue #488: use JSON_EXPORT on functions so they are properly exported on ↵Eric Haszlakiewicz2019-09-081-0/+2
| | | | Windows.
* remove [in] from params descriptionandy59952018-11-281-2/+2
| | | | Keeping this would be inconsistent with the other documentation
* json_object.h:document json_object_new_string_len()andy59952018-11-271-1/+12
| | | | | | I also added a couple trivial, but related, suggestions. closes #460
* Issue #419: document that NULL may be passed to json_object_put().Eric Haszlakiewicz2018-06-121-0/+1
|
* Fixed typosjanczer2018-04-241-9/+9
|
* Avoid uninitialized variable warningsJonathan Wiens2018-01-171-2/+2
| | | | | Fix json_object_object_foreach to avoid uninitialized variable warnings using ANSI C or MSC.
* Remove the TRUE and FALSE defines.Eric Haszlakiewicz2017-12-231-11/+5
|
* Fix non-GNUC define for JSON_C_CONST_FUNCTIONRikard Falkeborn2017-12-131-1/+1
|
* Apply gcc's "const" attribute to the json_c_object_sizeof() function as an ↵Eric Haszlakiewicz2017-12-121-1/+7
| | | | optimizer hint. Also, rename that function from json_object_sizeof().
* json_object: Add size_t json_object_sizeof()Björn Esser2017-12-111-0/+5
|
* Undeprecate the array_list, lh_table and printbuf typedefs, but move each to ↵Eric Haszlakiewicz2017-12-061-15/+1
| | | | the corresponding header files.
* Squash doxygen warnings, and make a few slight improvements to the docs.Eric Haszlakiewicz2017-12-061-1/+8
|
* Add a brief overview of each file to the docs.Eric Haszlakiewicz2017-12-061-0/+4
|
* Deprecated a few typedefs, add docs on json_object_iter, move ↵Eric Haszlakiewicz2017-12-051-8/+17
| | | | json_number_chars and json_hex-chars to json_object_private.h.
* Make sure to include the "*" on function pointer arguments to avoid a ↵Eric Haszlakiewicz2017-12-041-1/+1
| | | | warnings from VS2015. See also PR#384.
* Fix a VS 2015 compiler warning.ssrlive2017-12-041-1/+1
| | | In VS 2015, the warning text is "warning C4550: expression evaluates to a function which is missing an argument list".
* In json_object_deep_copy(), copy over _userdata, at least for ↵Eric Haszlakiewicz2017-11-291-2/+31
| | | | json_type_string's with the default serializer set, and provide a way for people using custom serializers to provide a custom shallow_copy method.
* Merge branch 'json_deep_copy' of https://github.com/commodo/json-c into ↵Eric Haszlakiewicz2017-11-291-0/+18
|\ | | | | | | commodo-json_deep_copy
| * json_object: implement json_object_deep_copy()Alexandru Ardelean2017-11-271-0/+18
| | | | | | | | | | | | | | | | Because doing `json_tokener_parse(json_object_get_string(src))` feels sloppy, dirty, and makes me want to cry at night sometimes. Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
* | Rename json_object_add_int() to json_object_int_inc() and eliminate the ↵Eric Haszlakiewicz2017-11-271-25/+9
|/ | | | "int64" variant since we store 64-bit values internally anyway.
* Merge pull request #363 from jvijtiuk/integer_additionEric Haszlakiewicz2017-11-271-0/+31
|\ | | | | Issue #338, add json_object_add_int functions
| * Add json_object_add_int functionsJuraj Vijtiuk2017-09-141-0/+31
| |
* | Issue #370: work around Clang-on-windows oddities by rearranging ifdefs.Eric Haszlakiewicz2017-10-221-2/+2
|/
* Issue#353: attempt to fix or ignore a few -Wdocumentation messages from Clang.Eric Haszlakiewicz2017-09-071-2/+19
|
* Merge pull request #319 from Dashlane/visual-studio-buildEric Haszlakiewicz2017-07-081-48/+54
|\ | | | | Windows: Fix dynamic library build with Visual Studio
| * Fix library build with Visual StudioDavid Henot2017-04-261-48/+54
| |
* | Add a json_c_set_serialization_double_format() function to set the ↵Eric Haszlakiewicz2017-06-181-0/+31
|/ | | | *library-wide* format for how doubles are written to a serialized JSON output.
* string set and testsStoian Ivanov2016-10-071-0/+20
|
* some basic setStoian Ivanov2016-10-051-3/+43
|
* json_object_set_boolean for upstream style checkStoian Ivanov2016-09-211-0/+13
|
* Issue #263: add const so the prototype for json_object_object_add_ex() ↵Eric Haszlakiewicz2016-08-241-2/+4
| | | | matches the definition.
* json_object_object_add_ex() should have shared code with ↵Eric Haszlakiewicz2016-08-201-1/+1
| | | | | | json_object_object_add(), and been changed to return int at the same time the latter was. Do that now. Also correct a couple of calls to _to_json_string to check the return value.
* Add method 'json_object_to_json_string_length'jobol2016-07-271-0/+10
| | | | | | | | | | This new method allows to also get the length of the generated string. Fix #165 Change-Id: Iea91404027f143ca3d29a4c58d7c07ae53556110 Signed-off-by: José Bollo <jose.bollo@iot.bzh>
* Issue #236: Add -Wcast-qual and fix casts to retain constness.Eric Haszlakiewicz2016-06-111-5/+7
| | | | | To better distinguish between entry->k and entry->v being const within linkhash, but non-const outside, add lh_entry_v() and lh_entry_k() accessors. Make lh_entry->k const.
* Merge pull request #233 from NeoRaider/size_t3Eric Haszlakiewicz2016-06-061-0/+1
|\ | | | | Include stddef.h in json_object.h
| * Include stddef.h in json_object.hMatthias Schiffer2016-05-291-0/+1
| | | | | | | | It is needed for size_t.
View Lorry Controller Status