| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | Add public API to get and set userdata | Matthias Schiffer | 2016-05-29 | 1 | -9/+54 | |
| |/ | | | | | Also, json_object_set_serializer is changed to respect the userdata and user_delete parameters when to_string_func is NULL. | |||||
| * | Issue #142: un-deprecate json_object_object_get(), but note why you might ↵ | Eric Haszlakiewicz | 2016-05-23 | 1 | -3/+7 | |
| | | | | | want to use json_object_object_get_ex() instead. | |||||
| * | Fix a few places that needed adjustment for the size_t changes, including ↵ | Eric Haszlakiewicz | 2016-05-23 | 1 | -1/+1 | |
| | | | | | updating the range checks to use a calculated SIZE_T_MAX. | |||||
| * | Merge branch 'fixes-for-upstream' of https://github.com/doctaweeks/json-c ↵ | Eric Haszlakiewicz | 2016-05-23 | 1 | -3/+3 | |
| |\ | | | | | | | into doctaweeks-fixes-for-upstream | |||||
| | * | Use size_t for json object array ops | Daniel M. Weeks | 2015-11-24 | 1 | -3/+3 | |
| | | | ||||||
| * | | Export json_object_double_to_json_string() and use custom format string | Jan-Philipp Litza | 2016-05-06 | 1 | -0/+28 | |
| | | | ||||||
| * | | Fix code in docs for json_object_new_double_s() | Jan-Philipp Litza | 2016-05-06 | 1 | -2/+2 | |
| | | | ||||||
| * | | Merge branch 'master' of https://github.com/Protovision/json-c into ↵ | Eric Haszlakiewicz | 2016-04-30 | 1 | -0/+13 | |
| |\ \ | | | | | | | | | | Protovision-master | |||||
| | * | | Added array_list_del_idx and json_object_array_del_idx | Mark Swoope | 2015-04-02 | 1 | -0/+13 | |
| | | | | ||||||
| * | | | Merge pull request #220 from hschaa/master | Eric Haszlakiewicz | 2016-04-30 | 1 | -0/+20 | |
| |\ \ \ | | | | | | | | | Add utility function for comparing json_objects | |||||
| | * | | | Add utility function for comparing json_objects | Helmut Schaa | 2016-01-13 | 1 | -0/+20 | |
| | | | | | ||||||
| * | | | | Clarify json_object_get_string documentation of NULL handling & returning | Mina Naguib | 2016-02-07 | 1 | -3/+8 | |
| |/ / / | ||||||
| * | | | Add const qualifiers to several functions that don't modify the json_object. | Eric Haszlakiewicz | 2015-12-26 | 1 | -16/+16 | |
| | | | | ||||||
| * | | | Merge commit '2be921d88376e78f84d79aafa6db2714da804e59' | Eric Haszlakiewicz | 2015-12-08 | 1 | -1/+4 | |
| |\ \ \ | ||||||
| | * | | | Fixed json_object_object_add(). | Alexander Klauer | 2013-01-08 | 1 | -1/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Return value of json_object_object_add() changed from void to int. Return value now indicates success or failure. * Check whether allocations are successful. * Do not exit program from within the library. | |||||
| * | | | | Fix issue #201: add a JSON_C_TO_STRING_NOSLASHESCAPE flag to turn off ↵ | Eric Haszlakiewicz | 2015-11-28 | 1 | -0/+5 | |
| | |_|/ |/| | | | | | | | | escaping of forward slashes. | |||||
| * | | | Merge pull request #196 from rgerhards/improve-performance | Eric Haszlakiewicz | 2015-09-28 | 1 | -0/+46 | |
| |\ \ \ | | | | | | | | | Performance improvements | |||||
| | * | | | add json_object_object_add_ex() API | Rainer Gerhards | 2015-09-23 | 1 | -0/+46 | |
| | | | | | | | | | | | | | | | | | | | | | This provides more control over some detail aspects, many of which are performance related. | |||||
| * | | | | Fix doc for json_object_new_boolean() to indicate the correct value for TRUE ↵ | Eric Haszlakiewicz | 2015-08-23 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | (1). | |||||
| * | | | | Add back in the __attribute__((__unused__)) that was lost in the previous ↵ | Eric Haszlakiewicz | 2015-08-23 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | commit. It's needed to squash a "variable 'val' set but not used" warning. | |||||
| * | | | | Merge pull request #183 from cryogen/master | Eric Haszlakiewicz | 2015-08-22 | 1 | -2/+2 | |
| |\ \ \ \ | | | | | | | | | | | Apply compile warning fix to master branch | |||||
| | * | | | | Fix uninitialised variable compile warning, and also fix unused-when-used ↵ | Stuart Walsh | 2015-05-10 | 1 | -2/+2 | |
| | | |_|/ | |/| | | | | | | | | | | warning | |||||
| * | | | | Adding JSON_C_TO_STRING_PRETTY_TAB flag | Jacob Alexander | 2015-05-27 | 1 | -0/+8 | |
| |/ / / | | | | | | | | | | - Tabs are easier to read for tired eyes and editor adjustable | |||||
| * | | | Slight style tweaks to the bsearch changest. | Eric Haszlakiewicz | 2015-03-04 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Merge pull request #155 from LeSpocky/bsearch | Eric Haszlakiewicz | 2015-03-03 | 1 | -0/+19 | |
| |\ \ \ | | | | | | | | | add bsearch for arrays | |||||
| | * | | | add bsearch for arrays | Alexander Dahl | 2014-08-21 | 1 | -0/+19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Arrays can already be sorted with json_object_array_sort() which uses qsort() of the standard C library. This adds a counterpart using the bsearch() from C. | |||||
| * | | | | Merge pull request #156 from jubalh/master | Eric Haszlakiewicz | 2015-03-03 | 1 | -5/+5 | |
| |\ \ \ \ | |_|/ / |/| | | | Remove trailing whitespaces | |||||
| | * | | | Remove trailing whitespace | Michael Vetter | 2014-08-26 | 1 | -5/+5 | |
| | |/ / | ||||||
| * | | | Merge pull request #153 from LeSpocky/doc | Eric Haszlakiewicz | 2014-09-13 | 1 | -0/+5 | |
| |\ \ \ | | | | | | | | | improve doc for json_object_to_json_string() | |||||
| | * | | | improve doc for json_object_to_json_string() | Alexander Dahl | 2014-08-18 | 1 | -0/+5 | |
| | |/ / | ||||||
| * | | | Remove json_type enum trailing comma | Michael J. Chinn | 2014-08-10 | 1 | -3/+3 | |
| |/ / | ||||||
| * | | Patch to address the following issues: | Michael Clark | 2014-04-09 | 1 | -2/+10 | |
| | | | | | | | | | | | * CVE-2013-6371: hash collision denial of service * CVE-2013-6370: buffer overflow if size_t is larger than int | |||||
| * | | Added a json_object_new_double_s() convenience function to allow an exact ↵ | Eric Haszlakiewicz | 2013-09-11 | 1 | -0/+42 | |
| | | | | | | | | | | | | | string representation of a double to be specified when creating the object and use it in json_tokener_parse_ex() so a re-serialized object more exactly matches the input. Add json_object_free_userdata() and json_object_userdata_to_json_string() too. | |||||
| * | | Add extern to json_object_set_serializer so that it gets exported (Windows fix) | Even Rouault | 2013-08-11 | 1 | -1/+1 | |
| | | | ||||||
| * | | one definition of json_object_object_foreach only works on c99 and later | Greg Hazel | 2013-03-19 | 1 | -2/+2 | |
| | | | ||||||
| * | | Merge branch 'remicollet-issue-float' | Eric Haszlakiewicz | 2013-02-26 | 1 | -0/+4 | |
| |\ \ | | | | | | | | | | | | | Conflicts: json_util.c | |||||
| | * | | probably worth an option for this | Remi Collet | 2012-12-13 | 1 | -0/+4 | |
| | | | | ||||||
| * | | | Mark the "val" variable in json_object_object_foreach as unused so the ↵ | Eric Haszlakiewicz | 2013-02-21 | 1 | -1/+1 | |
| | | | | | | | | | | | | | compiler doesn't complain. Fix warnings in the testReplaceExisting test. | |||||
| * | | | Add a comment briefly describing json_object_object_length() | Eric Haszlakiewicz | 2013-02-09 | 1 | -0/+3 | |
| | | | | ||||||
| * | | | add json_object_object_length | Greg Hazel | 2013-01-11 | 1 | -0/+2 | |
| | |/ |/| | ||||||
| * | | Make macro json_object_object_foreach multiple-use safe | Alexander Klauer | 2012-12-19 | 1 | -16/+16 | |
| |/ | ||||||
| * | Make it safe to delete keys while iterating with the ↵ | Eric Haszlakiewicz | 2012-10-20 | 1 | -5/+9 | |
| | | | | | json_object_object_foreach macro. | |||||
| * | Reformat the json_object_object_foreach macro so it is readable, and ↵ | Eric Haszlakiewicz | 2012-10-20 | 1 | -5/+24 | |
| | | | | | document what is allowed to be done with the object while iterating. | |||||
| * | Change json_object_put to return 1 if the object passed was actually freed. ↵ | Eric Haszlakiewicz | 2012-10-18 | 1 | -2/+2 | |
| | | | | | (or 0 if only the reference count was decremented) | |||||
| * | Add a json_set_serializer() function to allow the string output of a ↵ | Eric Haszlakiewicz | 2012-09-02 | 1 | -0/+45 | |
| | | | | | json_object to be customized. | |||||
| * | Add a json_object_to_json_string_ext() function to allow the formatting of ↵ | Eric Haszlakiewicz | 2012-04-28 | 1 | -1/+32 | |
| | | | | | | | | | | output to be selected. There are now three options: JSON_C_TO_STRING_SPACED, JSON_C_TO_STRING_PLAIN and JSON_C_TO_STRING_PRETTY. This also add a json_object_to_file_ext() that takes the same flags. Existing output of json_object_to_json_string() is unchanged, and uses JSON_C_TO_STRING_SPACED. Thanks fo Grant Edwards for the initial patches. | |||||
| * | Add NULL-safe get object method | Keith Derrick | 2012-04-12 | 1 | -0/+24 | |
| | | | | | | New json_object_object_get_ex() method protects itself against null pointers and invalid objects being passed in. | |||||
| * | Added explanatory notes to documentation. | Keith Derrick | 2012-04-05 | 1 | -11/+62 | |
| | | ||||||
| * | Mention json_type_to_name() in the docs for json_object_get_type(). | Eric Haszlakiewicz | 2012-03-31 | 1 | -1/+3 | |
| | | ||||||
| * | Adjust json_object_is_type and json_object_get_type so they return ↵ | Eric Haszlakiewicz | 2012-03-31 | 1 | -0/+2 | |
| | | | | | json_type_null for NULL objects. | |||||
 |
index : delta/json-c.git | |
| github.com: json-c/json-c.git |
| summaryrefslogtreecommitdiff |
path: root/json_object.h