mirror/json-c
1
0
Fork 0
mirror of https://github.com/json-c/json-c.git synced 2026-03-29 01:49:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add public API to get and set userdata

Browse Source 
Also, json_object_set_serializer is changed to respect the userdata
and user_delete parameters when to_string_func is NULL.
This commit is contained in:
Matthias Schiffer
2016-05-29 05:54:57 +02:00
parent c2b004ba0e
commit f87e378d48
2 changed files with 72 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
json_object.c
View File

@@ -235,6 +235,21 @@ enum json_type json_object_get_type(const struct json_object *jso)
return jso->o_type;
}
void* json_object_get_userdata(json_object *jso) {
return jso->_userdata;
}
void json_object_set_userdata(json_object *jso, void *userdata,
json_object_delete_fn *user_delete)
{
// First, clean up any previously existing user info
if (jso->_user_delete)
jso->_user_delete(jso, jso->_userdata);
jso->_userdata = userdata;
jso->_user_delete = user_delete;
}
/* set a custom conversion to string */
void json_object_set_serializer(json_object *jso,
@@ -242,13 +257,7 @@ void json_object_set_serializer(json_object *jso,
void *userdata,
json_object_delete_fn *user_delete)
{
// First, clean up any previously existing user info
if (jso->_user_delete)
{
jso->_user_delete(jso, jso->_userdata);
}
jso->_userdata = NULL;
jso->_user_delete = NULL;
json_object_set_userdata(jso, userdata, user_delete);
if (to_string_func == NULL)
{
@@ -281,8 +290,6 @@ void json_object_set_serializer(json_object *jso,
}
jso->_to_json_string = to_string_func;
jso->_userdata = userdata;
jso->_user_delete = user_delete;
}