avl: add AVL_TREE macro to define an initialized struct avl_tree

[project/libubox.git] / blobmsg.h

diff --git a/blobmsg.h b/blobmsg.h
index 3eeec9b035ea63aca99b2a7f9e609d7b9d6df958..e9e0e6e08ed4c0a03eee3a54accdf5f83fd7c052 100644 (file)
--- a/blobmsg.h
+++ b/blobmsg.h
@@ -65,7 +65,12 @@ 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);
-       return (char *) hdr + blobmsg_hdrlen(be16_to_cpu(hdr->namelen));
+       char *data = blob_data(attr);
+
+       if (blob_is_extended(attr))
+               data += blobmsg_hdrlen(be16_to_cpu(hdr->namelen));
+
+       return data;
 }
 
 static inline int blobmsg_data_len(const struct blob_attr *attr)
@@ -78,6 +83,11 @@ static inline int blobmsg_data_len(const struct blob_attr *attr)
        return blob_len(attr) - (end - start);
 }
 
+static inline int blobmsg_len(const struct blob_attr *attr)
+{
+       return blobmsg_data_len(attr);
+}
+
 bool blobmsg_check_attr(const struct blob_attr *attr, bool name);
 bool blobmsg_check_attr_list(const struct blob_attr *attr, int type);
 int blobmsg_parse(const struct blobmsg_policy *policy, int policy_len,
@@ -204,9 +214,10 @@ void blobmsg_printf(struct blob_buf *buf, const char *name, const char *format,
 /* blobmsg to json formatting */
 
 #define blobmsg_for_each_attr(pos, attr, rem) \
-       for (rem = blobmsg_data_len(attr), pos = blobmsg_data(attr); \
-                rem > 0 && (blob_pad_len(pos) <= rem) && \
-                (blob_pad_len(pos) >= sizeof(struct blob_attr)); \
-                rem -= blob_pad_len(pos), pos = blob_next(pos))
+       for (rem = attr ? blobmsg_data_len(attr) : 0, \
+            pos = attr ? blobmsg_data(attr) : 0; \
+            rem > 0 && (blob_pad_len(pos) <= rem) && \
+            (blob_pad_len(pos) >= sizeof(struct blob_attr)); \
+            rem -= blob_pad_len(pos), pos = blob_next(pos))
 
 #endif