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

json_object_object_add_ex() should have shared code with json_object_object_add(), and been changed to return int at the same time the latter was. Do that now.

Browse Source 
Also correct a couple of calls to _to_json_string to check the return value.
This commit is contained in:
Eric Haszlakiewicz
2016-08-20 22:35:29 -04:00
parent e40505e489
commit c4d060bf80
2 changed files with 12 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
json_object.c
View File

@@ -386,7 +386,8 @@ static int json_object_object_to_json_string(struct json_object* jso,
if(iter.val == NULL) if(iter.val == NULL)
sprintbuf(pb, "null"); sprintbuf(pb, "null");
else else
iter.val->_to_json_string(iter.val, pb, level+1,flags); if (iter.val->_to_json_string(iter.val, pb, level+1,flags) < 0)
return -1;
} }
if (flags & JSON_C_TO_STRING_PRETTY) if (flags & JSON_C_TO_STRING_PRETTY)
{ {
@@ -445,7 +446,7 @@ struct lh_table* json_object_get_object(const struct json_object *jso)
} }
} }
void json_object_object_add_ex(struct json_object* jso, int json_object_object_add_ex(struct json_object* jso,
const char *const key, const char *const key,
struct json_object *const val, struct json_object *const val,
const unsigned opts) const unsigned opts)
@@ -462,39 +463,21 @@ void json_object_object_add_ex(struct json_object* jso,
{ {
const void *const k = (opts & JSON_C_OBJECT_KEY_IS_CONSTANT) ? const void *const k = (opts & JSON_C_OBJECT_KEY_IS_CONSTANT) ?
(const void *)key : strdup(key); (const void *)key : strdup(key);
lh_table_insert_w_hash(jso->o.c_object, k, val, hash, opts); if (k == NULL)
return; return -1;
return lh_table_insert_w_hash(jso->o.c_object, k, val, hash, opts);
} }
existing_value = (json_object *) lh_entry_v(existing_entry); existing_value = (json_object *) lh_entry_v(existing_entry);
if (existing_value) if (existing_value)
json_object_put(existing_value); json_object_put(existing_value);
existing_entry->v = val; existing_entry->v = val;
return 0;
} }
int json_object_object_add(struct json_object* jso, const char *key, int json_object_object_add(struct json_object* jso, const char *key,
struct json_object *val) struct json_object *val)
{ {
// We lookup the entry and replace the value, rather than just deleting return json_object_object_add_ex(jso, key, val, 0);
// 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, (const void *)key);
existing_entry = lh_table_lookup_entry_w_hash(jso->o.c_object,
(const void *)key, hash);
if (!existing_entry)
{
char *keydup = strdup(key);
if (keydup == NULL)
return -1;
return lh_table_insert_w_hash(jso->o.c_object, keydup, val, hash, 0);
}
existing_value = (json_object *)lh_entry_v(existing_entry);
if (existing_value)
json_object_put(existing_value);
existing_entry->v = val;
return 0;
} }
@@ -929,6 +912,7 @@ static int json_object_array_to_json_string(struct json_object* jso,
{ {
int had_children = 0; int had_children = 0;
size_t ii; size_t ii;
sprintbuf(pb, "["); sprintbuf(pb, "[");
if (flags & JSON_C_TO_STRING_PRETTY) if (flags & JSON_C_TO_STRING_PRETTY)
sprintbuf(pb, "\n"); sprintbuf(pb, "\n");
@@ -949,7 +933,8 @@ static int json_object_array_to_json_string(struct json_object* jso,
if(val == NULL) if(val == NULL)
sprintbuf(pb, "null"); sprintbuf(pb, "null");
else else
val->_to_json_string(val, pb, level+1, flags); if (val->_to_json_string(val, pb, level+1, flags) < 0)
return -1;
} }
if (flags & JSON_C_TO_STRING_PRETTY) if (flags & JSON_C_TO_STRING_PRETTY)
{ {

2
json_object.h
View File

@@ -385,7 +385,7 @@ extern int json_object_object_add(struct json_object* obj, const char *key,
* @param opts process-modifying options. To specify multiple options, use * @param opts process-modifying options. To specify multiple options, use
* arithmetic or (OPT1|OPT2) * arithmetic or (OPT1|OPT2)
*/ */
extern void json_object_object_add_ex(struct json_object* obj, const char *key, extern int json_object_object_add_ex(struct json_object* obj, const char *key,
struct json_object *val, const unsigned opts); struct json_object *val, const unsigned opts);
/** Get the json_object associate with a given object field. /** Get the json_object associate with a given object field.