projects
/
project
/
libubox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libubox: drop legacy json-c support
[project/libubox.git]
/
blobmsg_json.c
diff --git
a/blobmsg_json.c
b/blobmsg_json.c
index
3b32b93
..
ffde23d
100644
(file)
--- a/
blobmsg_json.c
+++ b/
blobmsg_json.c
@@
-13,9
+13,16
@@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#include <inttypes.h>
#include "blobmsg.h"
#include "blobmsg_json.h"
#include "blobmsg.h"
#include "blobmsg_json.h"
+#ifdef JSONC
+ #include <json.h>
+#else
+ #include <json/json.h>
+#endif
+
bool blobmsg_add_object(struct blob_buf *b, json_object *obj)
{
json_object_object_foreach(obj, key, val) {
bool blobmsg_add_object(struct blob_buf *b, json_object *obj)
{
json_object_object_foreach(obj, key, val) {
@@
-75,7
+82,7
@@
static bool __blobmsg_add_json(struct blob_buf *b, json_object *obj)
{
bool ret = false;
{
bool ret = false;
- if (
is_error(obj)
)
+ if (
!obj
)
return false;
if (json_object_get_type(obj) != json_type_object)
return false;
if (json_object_get_type(obj) != json_type_object)
@@
-243,7
+250,7
@@
static void blobmsg_format_element(struct strbuf *s, struct blob_attr *attr, boo
sprintf(buf, "%d", (int32_t) be32_to_cpu(*(uint32_t *)data));
break;
case BLOBMSG_TYPE_INT64:
sprintf(buf, "%d", (int32_t) be32_to_cpu(*(uint32_t *)data));
break;
case BLOBMSG_TYPE_INT64:
- sprintf(buf, "%
lld", (long long in
t) be64_to_cpu(*(uint64_t *)data));
+ sprintf(buf, "%
" PRId64, (int64_
t) be64_to_cpu(*(uint64_t *)data));
break;
case BLOBMSG_TYPE_STRING:
blobmsg_format_string(s, data);
break;
case BLOBMSG_TYPE_STRING:
blobmsg_format_string(s, data);
@@
-286,6
+293,7
@@
static void blobmsg_format_json_list(struct strbuf *s, struct blob_attr *attr, i
char *blobmsg_format_json_with_cb(struct blob_attr *attr, bool list, blobmsg_json_format_t cb, void *priv, int indent)
{
struct strbuf s;
char *blobmsg_format_json_with_cb(struct blob_attr *attr, bool list, blobmsg_json_format_t cb, void *priv, int indent)
{
struct strbuf s;
+ bool array;
s.len = blob_len(attr);
s.buf = malloc(s.len);
s.len = blob_len(attr);
s.buf = malloc(s.len);
@@
-299,8
+307,11
@@
char *blobmsg_format_json_with_cb(struct blob_attr *attr, bool list, blobmsg_jso
s.indent_level = indent;
}
s.indent_level = indent;
}
+ array = blob_is_extended(attr) &&
+ blobmsg_type(attr) == BLOBMSG_TYPE_ARRAY;
+
if (list)
if (list)
- blobmsg_format_json_list(&s, blobmsg_data(attr), blobmsg_data_len(attr),
false
);
+ blobmsg_format_json_list(&s, blobmsg_data(attr), blobmsg_data_len(attr),
array
);
else
blobmsg_format_element(&s, attr, false, false);
else
blobmsg_format_element(&s, attr, false, false);