projects
/
project
/
libubox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
blobmsg_json: simplify add_separator and fix thread-safety
[project/libubox.git]
/
blobmsg_json.c
diff --git
a/blobmsg_json.c
b/blobmsg_json.c
index
ffde23d
..
5713948
100644
(file)
--- a/
blobmsg_json.c
+++ b/
blobmsg_json.c
@@
-49,9
+49,6
@@
bool blobmsg_add_json_element(struct blob_buf *b, const char *name, json_object
bool ret = true;
void *c;
bool ret = true;
void *c;
- if (!obj)
- return false;
-
switch (json_object_get_type(obj)) {
case json_type_object:
c = blobmsg_open_table(b, name);
switch (json_object_get_type(obj)) {
case json_type_object:
c = blobmsg_open_table(b, name);
@@
-72,6
+69,9
@@
bool blobmsg_add_json_element(struct blob_buf *b, const char *name, json_object
case json_type_int:
blobmsg_add_u32(b, name, json_object_get_int(obj));
break;
case json_type_int:
blobmsg_add_u32(b, name, json_object_get_int(obj));
break;
+ case json_type_null:
+ blobmsg_add_field(b, BLOBMSG_TYPE_UNSPEC, name, NULL, 0);
+ break;
default:
return false;
}
default:
return false;
}
@@
-135,21
+135,17
@@
static bool blobmsg_puts(struct strbuf *s, const char *c, int len)
static void add_separator(struct strbuf *s)
{
static void add_separator(struct strbuf *s)
{
- static char indent_chars[17] = "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
- int indent;
- char *start;
+ const char *indent_chars = "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
+ int len;
if (!s->indent)
return;
if (!s->indent)
return;
-
indent = s->indent_level
;
- if (
indent > 16
)
-
indent = 16
;
+
len = s->indent_level + 1
;
+ if (
len > strlen(indent_chars)
)
+
len = strlen(indent_chars)
;
- start = &indent_chars[sizeof(indent_chars) - indent - 1];
- *start = '\n';
- blobmsg_puts(s, start, indent + 1);
- *start = '\t';
+ blobmsg_puts(s, indent_chars, len);
}
}