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

json_editor: minor stylistic fixes and remove unused vars

parent 57c61505
Branches
No related tags found
No related merge requests found
...@@ -482,6 +482,7 @@ struct json_object *json_object_get_by_string_delimiter(struct json_object *src, ...@@ -482,6 +482,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)) { for (char *key = strtok(fmt_cpy,delimiter); key != NULL; key = strtok(NULL, delimiter)) {
int len = 0; int len = 0;
len = get_idx(key, idx, parsed_key); len = get_idx(key, idx, parsed_key);
json_object_object_get_ex(outer_obj, parsed_key, &ptr); json_object_object_get_ex(outer_obj, parsed_key, &ptr);
...@@ -490,6 +491,7 @@ struct json_object *json_object_get_by_string_delimiter(struct json_object *src, ...@@ -490,6 +491,7 @@ struct json_object *json_object_get_by_string_delimiter(struct json_object *src,
return NULL; return NULL;
int index = (idx[i] == -1 ? json_object_array_length(ptr) -1 : idx[i]); int index = (idx[i] == -1 ? json_object_array_length(ptr) -1 : idx[i]);
ptr = json_object_array_get_idx(ptr, index); ptr = json_object_array_get_idx(ptr, index);
} }
...@@ -507,11 +509,10 @@ int json_object_del_by_string(struct json_object *src, char *fmt) ...@@ -507,11 +509,10 @@ int json_object_del_by_string(struct json_object *src, char *fmt)
int json_object_del_by_string_delimiter(struct json_object *src, char *fmt, const char *delimiter) int json_object_del_by_string_delimiter(struct json_object *src, char *fmt, const char *delimiter)
{ {
struct json_object *ptr, *outer_obj, *j_idx; struct json_object *ptr, *outer_obj;
char fmt_cpy[1024] = {0}, parsed_key[32] = {0}; char fmt_cpy[1024] = {0}, parsed_key[32] = {0};
char *p, *key = fmt; char *p, *key = fmt;
int idx[32]; int idx[32];
int len;
if (!src) { if (!src) {
fprintf(stderr, "%s error: No object\n", __func__); fprintf(stderr, "%s error: No object\n", __func__);
...@@ -534,6 +535,7 @@ int json_object_del_by_string_delimiter(struct json_object *src, char *fmt, cons ...@@ -534,6 +535,7 @@ int json_object_del_by_string_delimiter(struct json_object *src, char *fmt, cons
if (p) { if (p) {
int len = 0; int len = 0;
len = get_idx(key, idx, parsed_key); len = get_idx(key, idx, parsed_key);
json_object_object_get_ex(outer_obj, parsed_key, &ptr); json_object_object_get_ex(outer_obj, parsed_key, &ptr);
...@@ -542,6 +544,7 @@ int json_object_del_by_string_delimiter(struct json_object *src, char *fmt, cons ...@@ -542,6 +544,7 @@ int json_object_del_by_string_delimiter(struct json_object *src, char *fmt, cons
return -1; return -1;
int index = (idx[i] == -1 ? json_object_array_length(ptr) -1 : idx[i]); int index = (idx[i] == -1 ? json_object_array_length(ptr) -1 : idx[i]);
ptr = json_object_array_get_idx(ptr, index); ptr = json_object_array_get_idx(ptr, index);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment