projects
/
project
/
libubox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
blobmsg: allow data/length iterator/accessor functions to work on non-blobmsg elements
[project/libubox.git]
/
blobmsg.h
diff --git
a/blobmsg.h
b/blobmsg.h
index 4619643e27d6c97b19878d3cfcaee65fef4e68fa..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);
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)
}
static inline int blobmsg_data_len(const struct blob_attr *attr)