X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=blobdiff_plain;f=blobmsg.h;h=e58f95deb6be700c501fdfb2b8b604df459db47b;hp=98f673a2e6a11333cc9cb6268eef005f43f5b73e;hb=827ad8337e88ec9e0bf73a8af1d6cf8555e8ef3d;hpb=d07b174de8faf76a20cbe003bfc143552f431f85

diff --git a/blobmsg.h b/blobmsg.h
index 98f673a..e58f95d 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,7 +214,10 @@ 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);