X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=blobdiff_plain;f=blobmsg.h;h=e51c39d662bb4173437deb231cdc85a9e55471f7;hp=554bed8c1add427af1c94b44e698a17b29e97b8e;hb=5aed3c2d2ea7c3aadf73b4ee1fd342421dbb6056;hpb=ff585b97c0b061d3ef7a026a331fa0079e0a7d94 diff --git a/blobmsg.h b/blobmsg.h index 554bed8..e51c39d 100644 --- 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); } -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 (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; @@ -139,7 +139,30 @@ 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, bool named); +static inline uint8_t blobmsg_get_u8(struct blob_attr *attr) +{ + return *(uint8_t *) blobmsg_data(attr); +} + +static inline uint16_t blobmsg_get_u16(struct blob_attr *attr) +{ + return *(uint16_t *) blobmsg_data(attr); +} + +static inline uint32_t blobmsg_get_u32(struct blob_attr *attr) +{ + return *(uint32_t *) blobmsg_data(attr); +} + +static inline uint64_t blobmsg_get_u64(struct blob_attr *attr) +{ + return *(uint64_t *) blobmsg_data(attr); +} + +void *blobmsg_alloc_string_buffer(struct blob_buf *buf, const char *name, int maxlen); +void blobmsg_add_string_buffer(struct blob_buf *buf); + +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); \