X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=blobmsg.h;h=861a4e8db9336f81056b18e01809c3a0c08dbfec;hb=77a629375d7387a33a59509d9d751a8798134cab;hp=98f673a2e6a11333cc9cb6268eef005f43f5b73e;hpb=d07b174de8faf76a20cbe003bfc143552f431f85;p=project%2Flibubox.git diff --git a/blobmsg.h b/blobmsg.h index 98f673a..861a4e8 100644 --- a/blobmsg.h +++ b/blobmsg.h @@ -51,6 +51,12 @@ static inline int blobmsg_hdrlen(unsigned int namelen) return BLOBMSG_PADDING(sizeof(struct blobmsg_hdr) + namelen + 1); } +static inline void blobmsg_clear_name(struct blob_attr *attr) +{ + struct blobmsg_hdr *hdr = (struct blobmsg_hdr *) blob_data(attr); + hdr->name[0] = 0; +} + static inline const char *blobmsg_name(const struct blob_attr *attr) { struct blobmsg_hdr *hdr = (struct blobmsg_hdr *) blob_data(attr); @@ -65,7 +71,7 @@ static inline int blobmsg_type(const struct blob_attr *attr) static inline void *blobmsg_data(const struct blob_attr *attr) { struct blobmsg_hdr *hdr = (struct blobmsg_hdr *) blob_data(attr); - char *data = blob_data(attr); + char *data = (char *) blob_data(attr); if (blob_is_extended(attr)) data += blobmsg_hdrlen(be16_to_cpu(hdr->namelen)); @@ -90,6 +96,15 @@ static inline int blobmsg_len(const struct blob_attr *attr) bool blobmsg_check_attr(const struct blob_attr *attr, bool name); bool blobmsg_check_attr_list(const struct blob_attr *attr, int type); + +/* + * blobmsg_check_array: validate array/table and return size + * + * Checks if all elements of an array or table are valid and have + * the specified type. Returns the number of elements in the array + */ +int blobmsg_check_array(const struct blob_attr *attr, int type); + int blobmsg_parse(const struct blobmsg_policy *policy, int policy_len, struct blob_attr **tb, void *data, unsigned int len); int blobmsg_parse_array(const struct blobmsg_policy *policy, int policy_len, @@ -191,7 +206,7 @@ static inline uint32_t blobmsg_get_u32(struct blob_attr *attr) static inline uint64_t blobmsg_get_u64(struct blob_attr *attr) { - uint32_t *ptr = blobmsg_data(attr); + uint32_t *ptr = (uint32_t *) blobmsg_data(attr); uint64_t tmp = ((uint64_t) be32_to_cpu(ptr[0])) << 32; tmp |= be32_to_cpu(ptr[1]); return tmp; @@ -199,15 +214,18 @@ static inline uint64_t blobmsg_get_u64(struct blob_attr *attr) static inline char *blobmsg_get_string(struct blob_attr *attr) { - return blobmsg_data(attr); + if (!attr) + return NULL; + + return (char *) blobmsg_data(attr); } void *blobmsg_alloc_string_buffer(struct blob_buf *buf, const char *name, unsigned int maxlen); void *blobmsg_realloc_string_buffer(struct blob_buf *buf, unsigned int maxlen); void blobmsg_add_string_buffer(struct blob_buf *buf); -void blobmsg_vprintf(struct blob_buf *buf, const char *name, const char *format, va_list arg); -void blobmsg_printf(struct blob_buf *buf, const char *name, const char *format, ...) +int blobmsg_vprintf(struct blob_buf *buf, const char *name, const char *format, va_list arg); +int blobmsg_printf(struct blob_buf *buf, const char *name, const char *format, ...) __attribute__((format(printf, 3, 4))); @@ -215,7 +233,7 @@ void blobmsg_printf(struct blob_buf *buf, const char *name, const char *format, #define blobmsg_for_each_attr(pos, attr, rem) \ for (rem = attr ? blobmsg_data_len(attr) : 0, \ - pos = attr ? blobmsg_data(attr) : 0; \ + pos = (struct blob_attr *) (attr ? blobmsg_data(attr) : NULL); \ rem > 0 && (blob_pad_len(pos) <= rem) && \ (blob_pad_len(pos) >= sizeof(struct blob_attr)); \ rem -= blob_pad_len(pos), pos = blob_next(pos))