X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=blobdiff_plain;f=blobmsg.h;h=c266855245ab80b69ef77e8faf2ae15d7c731bdf;hp=728f9e3e1d895f5b8d7bbb6d264f477a94433923;hb=08aada9a932b5abde3f18492568d5b2187b49a32;hpb=01ad5162b27b29fd0bfe5b862a1a719ba4870e0a

diff --git a/blobmsg.h b/blobmsg.h
index 728f9e3..c266855 100644
--- a/blobmsg.h
+++ b/blobmsg.h
@@ -31,7 +31,8 @@ enum blobmsg_type {
 	BLOBMSG_TYPE_INT16,
 	BLOBMSG_TYPE_INT8,
 	__BLOBMSG_TYPE_LAST,
-	BLOBMSG_TYPE_LAST = __BLOBMSG_TYPE_LAST - 1
+	BLOBMSG_TYPE_LAST = __BLOBMSG_TYPE_LAST - 1,
+	BLOBMSG_TYPE_BOOL = BLOBMSG_TYPE_INT8,
 };
 
 struct blobmsg_hdr {
@@ -55,10 +56,15 @@ static inline const char *blobmsg_name(const struct blob_attr *attr)
 	return (const char *) hdr->name;
 }
 
+static inline int blobmsg_type(const struct blob_attr *attr)
+{
+	return blob_id(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);
+	return (char *) hdr + blobmsg_hdrlen(be16_to_cpu(hdr->namelen));
 }
 
 static inline int blobmsg_data_len(const struct blob_attr *attr)
@@ -144,6 +150,11 @@ static inline uint8_t blobmsg_get_u8(struct blob_attr *attr)
 	return *(uint8_t *) blobmsg_data(attr);
 }
 
+static inline bool blobmsg_get_bool(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);
@@ -164,20 +175,9 @@ void blobmsg_add_string_buffer(struct blob_buf *buf);
 
 /* blobmsg to json formatting */
 
-typedef const char *(*blobmsg_json_format_t)(void *priv, struct blob_attr *attr);
-
-char *blobmsg_format_json_with_cb(struct blob_attr *attr, bool list,
-				  blobmsg_json_format_t cb, void *priv);
-
-static inline char *blobmsg_format_json(struct blob_attr *attr, bool list)
-{
-	return blobmsg_format_json_with_cb(attr, list, NULL, NULL);
-}
-
-
 #define blobmsg_for_each_attr(pos, attr, rem) \
 	for (rem = blobmsg_data_len(attr), pos = blobmsg_data(attr); \
-		 (blob_pad_len(pos) <= rem) && \
+		 rem > 0 && (blob_pad_len(pos) <= rem) && \
 		 (blob_pad_len(pos) >= sizeof(struct blob_attr)); \
 		 rem -= blob_pad_len(pos), pos = blob_next(pos))