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

add json_object_object_add_ex() API

Browse Source 
This provides more control over some detail aspects, many
of which are performance related.
This commit is contained in:
Rainer Gerhards
2015-09-23 09:08:49 +02:00
parent d8e44dc685
commit 2d549662be
4 changed files with 80 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
json_object.c
View File

@@ -355,7 +355,8 @@ static int json_object_object_to_json_string(struct json_object* jso,
static void json_object_lh_entry_free(struct lh_entry *ent)
{
free(ent->k);
if (!ent->k_is_constant)
free(ent->k);
json_object_put((struct json_object*)ent->v);
}
@@ -396,6 +397,31 @@ struct lh_table* json_object_get_object(struct json_object *jso)
}
}
void json_object_object_add_ex(struct json_object* jso,
const char *const key,
struct json_object *const val,
const unsigned opts)
{
// We lookup the entry and replace the value, rather than just deleting
// and re-adding it, so the existing key remains valid.
json_object *existing_value = NULL;
struct lh_entry *existing_entry;
const unsigned long hash = lh_get_hash(jso->o.c_object, (void*)key);
existing_entry = (opts & JSON_C_OBJECT_ADD_KEY_IS_NEW) ? NULL :
lh_table_lookup_entry_w_hash(jso->o.c_object, (void*)key, hash);
if (!existing_entry)
{
void *const k = (opts & JSON_C_OBJECT_KEY_IS_CONSTANT) ?
(void*)key : strdup(key);
lh_table_insert_w_hash(jso->o.c_object, k, val, hash, opts);
return;
}
existing_value = (void *)existing_entry->v;
if (existing_value)
json_object_put(existing_value);
existing_entry->v = val;
}
void json_object_object_add(struct json_object* jso, const char *key,
struct json_object *val)
{
@@ -407,7 +433,7 @@ void json_object_object_add(struct json_object* jso, const char *key,
existing_entry = lh_table_lookup_entry_w_hash(jso->o.c_object, (void*)key, hash);
if (!existing_entry)
{
lh_table_insert_w_hash(jso->o.c_object, strdup(key), val, hash);
lh_table_insert_w_hash(jso->o.c_object, strdup(key), val, hash, 0);
return;
}
existing_value = (void *)existing_entry->v;