};
struct blobmsg_hdr {
- uint8_t namelen;
+ uint16_t namelen;
uint8_t name[];
} __packed;
return BLOBMSG_PADDING(sizeof(struct blobmsg_hdr) + namelen + 1);
}
-static inline void *blobmsg_name(struct blob_attr *attr)
+static inline const char *blobmsg_name(const struct blob_attr *attr)
{
struct blobmsg_hdr *hdr = blob_data(attr);
- return &hdr->name;
+ return (const char *) hdr->name;
}
-static inline void *blobmsg_data(struct blob_attr *attr)
+static inline void *blobmsg_data(const struct blob_attr *attr)
{
struct blobmsg_hdr *hdr = blob_data(attr);
- return &hdr->name[blobmsg_hdrlen(hdr->namelen) - 1];
+ return (char *) hdr + blobmsg_hdrlen(hdr->namelen);
}
-static inline int blobmsg_data_len(struct blob_attr *attr)
+static inline int blobmsg_data_len(const struct blob_attr *attr)
{
uint8_t *start, *end;
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