blobmsg: reuse blobmsg_namelen in blobmsg_data

Move blobmsg_namelen into header file so it's possible to reuse it in
blobmsg_data.

Signed-off-by: Petr Štetiar <ynezz@true.cz>

diff --git a/blobmsg.c b/blobmsg.c
index 7cd0934600deac2f92c98a59cbc51cfa434a25a0..48dba8156d58ffe60af2604e59250b8a8e3cf4c9 100644 (file)
--- a/blobmsg.c
+++ b/blobmsg.c
@@ -25,12 +25,6 @@ static const int blob_type[__BLOBMSG_TYPE_LAST] = {
        [BLOBMSG_TYPE_UNSPEC] = BLOB_ATTR_BINARY,
 };
 
-static uint16_t
-blobmsg_namelen(const struct blobmsg_hdr *hdr)
-{
-       return be16_to_cpu(hdr->namelen);
-}
-
 bool blobmsg_check_attr(const struct blob_attr *attr, bool name)
 {
        return blobmsg_check_attr_len(attr, name, blob_raw_len(attr));

diff --git a/blobmsg.h b/blobmsg.h
index af88c1feb86fb54c374c558afbaaaef8ebfbd8d7..be3c7ee2cbfd90c85dd7e7ead4126e65bd2935f8 100644 (file)
--- a/blobmsg.h
+++ b/blobmsg.h
@@ -69,6 +69,11 @@ static inline int blobmsg_type(const struct blob_attr *attr)
        return blob_id(attr);
 }
 
+static uint16_t blobmsg_namelen(const struct blobmsg_hdr *hdr)
+{
+       return be16_to_cpu(hdr->namelen);
+}
+
 static inline void *blobmsg_data(const struct blob_attr *attr)
 {
        struct blobmsg_hdr *hdr;
@@ -81,7 +86,7 @@ static inline void *blobmsg_data(const struct blob_attr *attr)
        data = (char *) blob_data(attr);
 
        if (blob_is_extended(attr))
-               data += blobmsg_hdrlen(be16_to_cpu(hdr->namelen));
+               data += blobmsg_hdrlen(blobmsg_namelen(hdr));
 
        return data;
 }