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

Change json_object_put to return 1 if the object passed was actually freed. (or 0 if only the reference count was decremented)

Browse Source
This commit is contained in:
Eric Haszlakiewicz
2012-10-18 17:10:09 -05:00
parent c3d1d597ab
commit 5f4739e2eb
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
json_object.c
View File

@@ -139,7 +139,7 @@ extern struct json_object* json_object_get(struct json_object *jso)
return jso; return jso;
} }
extern void json_object_put(struct json_object *jso) int json_object_put(struct json_object *jso)
{ {
if(jso) if(jso)
{ {
@@ -149,8 +149,10 @@ extern void json_object_put(struct json_object *jso)
if (jso->_user_delete) if (jso->_user_delete)
jso->_user_delete(jso, jso->_userdata); jso->_user_delete(jso, jso->_userdata);
jso->_delete(jso); jso->_delete(jso);
return 1;
} }
} }
return 0;
} }
@@ -410,7 +412,7 @@ json_bool json_object_object_get_ex(struct json_object* jso, const char *key, st
void json_object_object_del(struct json_object* jso, const char *key) void json_object_object_del(struct json_object* jso, const char *key)
{ {
lh_table_delete(jso->o.c_object, key); lh_table_delete(jso->o.c_object, key);
} }

4
json_object.h
View File

@@ -112,9 +112,9 @@ extern struct json_object* json_object_get(struct json_object *obj);
* imbalance in the reference count. * imbalance in the reference count.
* *
* @param obj the json_object instance * @param obj the json_object instance
* @returns 1 if the object was freed.
*/ */
extern void json_object_put(struct json_object *obj); int json_object_put(struct json_object *obj);
/** /**
* Check if the json_object is of a given type * Check if the json_object is of a given type