Skip to content
Snippets Groups Projects
Commit 867a96da authored by Jakob Olsson's avatar Jakob Olsson
Browse files

get rid of tmp vars

parent 00a29f00
Branches
No related tags found
No related merge requests found
......@@ -255,14 +255,14 @@ static int add_val(struct json_object *src, char *key, char *val, enum json_type
if (len < 1) {
/* if a key is provided, place input under that key, else place in root */
if (key) {
struct json_object *tmp;
struct json_object *j_new;
tmp = json_object_new_object();
if (!tmp)
j_new = json_object_new_object();
if (!j_new)
return -1;
copy_object_into_object(j_val, tmp);
json_object_object_add(src, parsed_key, tmp);
copy_object_into_object(j_val, j_new);
json_object_object_add(src, parsed_key, j_new);
} else
copy_object_into_object(j_val, src);
......@@ -402,15 +402,15 @@ int json_object_set_delimiter(struct json_object *src, char *fmt, struct json_ob
strcpy(fmt_cpy, fmt);
for (p = strtok(fmt_cpy,delimiter); p != NULL; p = strtok(NULL, delimiter)) {
struct json_object *ptr, *tmp = src;
struct json_object *ptr, *outer_obj = src;
json_object_object_get_ex(tmp, p, &ptr);
json_object_object_get_ex(outer_obj, p, &ptr);
if (!ptr) {
ptr = json_object_new_object();
json_object_object_add(tmp, p, ptr);
json_object_object_add(outer_obj, p, ptr);
}
tmp = ptr;
outer_obj = ptr;
}
json_object_object_foreach(val, key, j_val)
......@@ -426,7 +426,7 @@ struct json_object *json_object_get_by_string(struct json_object *src, char *fmt
struct json_object *json_object_get_by_string_delimiter(struct json_object *src, char *fmt, const char *delimiter)
{
struct json_object *ptr, *tmp = src;
struct json_object *ptr, *outer_obj = src;
char fmt_cpy[1024] = {0};
char parsed_key[32] = {0};
int idx[32];
......@@ -436,7 +436,7 @@ struct json_object *json_object_get_by_string_delimiter(struct json_object *src,
for (char *key = strtok(fmt_cpy,delimiter); key != NULL; key = strtok(NULL, delimiter)) {
int len = 0;
len = get_idx(key, idx, parsed_key);
json_object_object_get_ex(tmp, parsed_key, &ptr);
json_object_object_get_ex(outer_obj, parsed_key, &ptr);
for (int i = 0; i < len; i++) {
if (!json_object_is_type(ptr, json_type_array))
......@@ -446,7 +446,7 @@ struct json_object *json_object_get_by_string_delimiter(struct json_object *src,
ptr = json_object_array_get_idx(ptr, index);
}
tmp = ptr;
outer_obj = ptr;
}
return ptr;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment