blobmsg: constify and add more validation

[project/libubox.git] / blobmsg.h

diff --git a/blobmsg.h b/blobmsg.h
index aa1f314..e978235 100644 (file)
--- a/blobmsg.h
+++ b/blobmsg.h
@@ -49,19 +49,19 @@ static inline int blobmsg_hdrlen(int namelen)
        return BLOBMSG_PADDING(sizeof(struct blobmsg_hdr) + namelen + 1);
 }
 
        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);
 {
        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 (char *) hdr + blobmsg_hdrlen(hdr->namelen);
 }
 
 {
        struct blobmsg_hdr *hdr = blob_data(attr);
        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;
 
 {
        uint8_t *start, *end;
 


@@ -139,7 +139,7 @@ static inline int blobmsg_buf_init(struct blob_buf *buf)
        return blob_buf_init(buf, BLOBMSG_TYPE_TABLE);
 }
 
        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); \
 
 #define blobmsg_for_each_attr(pos, attr, rem) \
        for (rem = blobmsg_data_len(attr), pos = blobmsg_data(attr); \