add support for json-formatting blobmsg elements

[project/libubox.git] / blobmsg.h

diff --git a/blobmsg.h b/blobmsg.h
index 95732e3..7c63dbf 100644 (file)
--- a/blobmsg.h
+++ b/blobmsg.h
@@ -49,10 +49,10 @@ static inline int blobmsg_hdrlen(int namelen)
        return BLOBMSG_PADDING(sizeof(struct blobmsg_hdr) + namelen + 1);
 }
 
-static inline void *blobmsg_name(struct blob_attr *attr)
+static inline char *blobmsg_name(struct blob_attr *attr)
 {
        struct blobmsg_hdr *hdr = blob_data(attr);
-       return &hdr->name;
+       return (char *) hdr->name;
 }
 
 static inline void *blobmsg_data(struct blob_attr *attr)
@@ -139,6 +139,12 @@ static inline int blobmsg_buf_init(struct blob_buf *buf)
        return blob_buf_init(buf, BLOBMSG_TYPE_TABLE);
 }
 
-char *blobmsg_format_json(struct blob_attr *attr);
+char *blobmsg_format_json(struct blob_attr *attr, bool list);
+
+#define blobmsg_for_each_attr(pos, attr, rem) \
+       for (rem = blobmsg_data_len(attr), pos = blobmsg_data(attr); \
+                (blob_pad_len(pos) <= rem) && \
+                (blob_pad_len(pos) >= sizeof(struct blob_attr)); \
+                rem -= blob_pad_len(pos), pos = blob_next(pos))
 
 #endif