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

Drop the _delete field from struct json_object and call the type-specific delete functions directly from json_object_put. (Thanks @dota17 for the suggestion in PR #632!)

Browse Source
This commit is contained in:
Eric Haszlakiewicz
2020-06-13 18:34:35 +00:00
parent 4c10712114
commit 5ebfeaedc5
2 changed files with 30 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
json_object.c
View File

@@ -121,15 +121,17 @@ static inline const struct json_object_string *JC_STRING_C(const struct json_obj
#define JC_CONCAT(a,b) a##b #define JC_CONCAT(a,b) a##b
#define JC_CONCAT3(a,b,c) a##b##c #define JC_CONCAT3(a,b,c) a##b##c
#define JSON_OBJECT_NEW(jtype, delete_fn) \ #define JSON_OBJECT_NEW(jtype) \
(struct JC_CONCAT(json_object_,jtype) *)json_object_new(JC_CONCAT(json_type_,jtype), \ (struct JC_CONCAT(json_object_,jtype) *)json_object_new(JC_CONCAT(json_type_,jtype), \
sizeof(struct JC_CONCAT(json_object_,jtype)), \ sizeof(struct JC_CONCAT(json_object_,jtype)), \
&JC_CONCAT3(json_object_,jtype,_to_json_string), \ &JC_CONCAT3(json_object_,jtype,_to_json_string))
delete_fn)
static inline struct json_object *json_object_new(enum json_type o_type, static inline struct json_object *json_object_new(enum json_type o_type,
size_t alloc_size, size_t alloc_size,
json_object_to_json_string_fn *to_json_string, json_object_to_json_string_fn *to_json_string);
json_object_private_delete_fn *delete_fn);
static void json_object_object_delete(struct json_object *jso_base);
static void json_object_string_delete(struct json_object *jso);
static void json_object_array_delete(struct json_object *jso);
static json_object_to_json_string_fn json_object_object_to_json_string; static json_object_to_json_string_fn json_object_object_to_json_string;
static json_object_to_json_string_fn json_object_boolean_to_json_string; static json_object_to_json_string_fn json_object_boolean_to_json_string;
@@ -322,7 +324,21 @@ int 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); switch(jso->o_type)
{
case json_type_object:
json_object_object_delete(jso);
break;
case json_type_array:
json_object_array_delete(jso);
break;
case json_type_string:
json_object_string_delete(jso);
break;
default:
json_object_generic_delete(jso);
break;
}
return 1; return 1;
} }
@@ -341,8 +357,7 @@ static void json_object_generic_delete(struct json_object *jso)
static inline struct json_object *json_object_new(enum json_type o_type, static inline struct json_object *json_object_new(enum json_type o_type,
size_t alloc_size, size_t alloc_size,
json_object_to_json_string_fn *to_json_string, json_object_to_json_string_fn *to_json_string)
json_object_private_delete_fn *delete_fn)
{ {
struct json_object *jso; struct json_object *jso;
@@ -352,7 +367,6 @@ static inline struct json_object *json_object_new(enum json_type o_type,
jso->o_type = o_type; jso->o_type = o_type;
jso->_ref_count = 1; jso->_ref_count = 1;
jso->_delete = delete_fn;
jso->_to_json_string = to_json_string; jso->_to_json_string = to_json_string;
jso->_pb = NULL; jso->_pb = NULL;
jso->_user_delete = NULL; jso->_user_delete = NULL;
@@ -552,7 +566,7 @@ static void json_object_object_delete(struct json_object *jso_base)
struct json_object *json_object_new_object(void) struct json_object *json_object_new_object(void)
{ {
struct json_object_object *jso = JSON_OBJECT_NEW(object, &json_object_object_delete); struct json_object_object *jso = JSON_OBJECT_NEW(object);
if (!jso) if (!jso)
return NULL; return NULL;
jso->c_object = jso->c_object =
@@ -676,7 +690,7 @@ static int json_object_boolean_to_json_string(struct json_object *jso, struct pr
struct json_object *json_object_new_boolean(json_bool b) struct json_object *json_object_new_boolean(json_bool b)
{ {
struct json_object_boolean *jso = JSON_OBJECT_NEW(boolean, &json_object_generic_delete); struct json_object_boolean *jso = JSON_OBJECT_NEW(boolean);
if (!jso) if (!jso)
return NULL; return NULL;
jso->c_boolean = b; jso->c_boolean = b;
@@ -794,7 +808,7 @@ int json_object_set_int(struct json_object *jso, int new_value)
struct json_object *json_object_new_int64(int64_t i) struct json_object *json_object_new_int64(int64_t i)
{ {
struct json_object_int *jso = JSON_OBJECT_NEW(int, &json_object_generic_delete); struct json_object_int *jso = JSON_OBJECT_NEW(int);
if (!jso) if (!jso)
return NULL; return NULL;
jso->cint.c_int64 = i; jso->cint.c_int64 = i;
@@ -804,7 +818,7 @@ struct json_object *json_object_new_int64(int64_t i)
struct json_object *json_object_new_uint64(uint64_t i) struct json_object *json_object_new_uint64(uint64_t i)
{ {
struct json_object_int *jso = JSON_OBJECT_NEW(int, &json_object_generic_delete); struct json_object_int *jso = JSON_OBJECT_NEW(int);
if (!jso) if (!jso)
return NULL; return NULL;
jso->cint.c_uint64 = i; jso->cint.c_uint64 = i;
@@ -1108,7 +1122,7 @@ int json_object_double_to_json_string(struct json_object *jso, struct printbuf *
struct json_object *json_object_new_double(double d) struct json_object *json_object_new_double(double d)
{ {
struct json_object_double *jso = JSON_OBJECT_NEW(double, &json_object_generic_delete); struct json_object_double *jso = JSON_OBJECT_NEW(double);
if (!jso) if (!jso)
return NULL; return NULL;
jso->base._to_json_string = &json_object_double_to_json_string_default; jso->base._to_json_string = &json_object_double_to_json_string_default;
@@ -1273,7 +1287,7 @@ static struct json_object *_json_object_new_string(const char *s, const size_t l
objsize += sizeof(void *) - len; objsize += sizeof(void *) - len;
jso = (struct json_object_string *)json_object_new(json_type_string, objsize, jso = (struct json_object_string *)json_object_new(json_type_string, objsize,
&json_object_string_to_json_string, &json_object_string_delete); &json_object_string_to_json_string);
if (!jso) if (!jso)
return NULL; return NULL;
@@ -1427,7 +1441,7 @@ static void json_object_array_delete(struct json_object *jso)
struct json_object *json_object_new_array(void) struct json_object *json_object_new_array(void)
{ {
struct json_object_array *jso = JSON_OBJECT_NEW(array, &json_object_array_delete); struct json_object_array *jso = JSON_OBJECT_NEW(array);
if (!jso) if (!jso)
return NULL; return NULL;
jso->c_array = array_list_new(&json_object_array_entry_free); jso->c_array = array_list_new(&json_object_array_entry_free);

3
json_object_private.h
View File

@@ -29,8 +29,6 @@ struct json_object;
typedef SSIZE_T ssize_t; typedef SSIZE_T ssize_t;
#endif #endif
typedef void (json_object_private_delete_fn)(struct json_object *o);
/* json object int type, support extension*/ /* json object int type, support extension*/
typedef enum json_object_int_type typedef enum json_object_int_type
{ {
@@ -42,7 +40,6 @@ struct json_object
{ {
enum json_type o_type; enum json_type o_type;
uint32_t _ref_count; uint32_t _ref_count;
json_object_private_delete_fn *_delete;
json_object_to_json_string_fn *_to_json_string; json_object_to_json_string_fn *_to_json_string;
struct printbuf *_pb; struct printbuf *_pb;
json_object_delete_fn *_user_delete; json_object_delete_fn *_user_delete;