DGNum/libubox
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

blobmsg: reuse blobmsg_namelen in blobmsg_data

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

Signed-off-by: Petr Štetiar <ynezz@true.cz>
This commit is contained in:
Petr Štetiar 2019-12-12 16:42:39 +01:00
parent 586ce031ea
commit 86f6a5b8d1
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
blobmsg.c
View file

@ -25,12 +25,6 @@ static const int blob_type[__BLOBMSG_TYPE_LAST] = {
[BLOBMSG_TYPE_UNSPEC] = BLOB_ATTR_BINARY, [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) bool blobmsg_check_attr(const struct blob_attr *attr, bool name)
{ {
return blobmsg_check_attr_len(attr, name, blob_raw_len(attr)); return blobmsg_check_attr_len(attr, name, blob_raw_len(attr));

7
blobmsg.h
View file

@ -69,6 +69,11 @@ static inline int blobmsg_type(const struct blob_attr *attr)
return blob_id(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) static inline void *blobmsg_data(const struct blob_attr *attr)
{ {
struct blobmsg_hdr *hdr; struct blobmsg_hdr *hdr;
@ -81,7 +86,7 @@ static inline void *blobmsg_data(const struct blob_attr *attr)
data = (char *) blob_data(attr); data = (char *) blob_data(attr);
if (blob_is_extended(attr)) if (blob_is_extended(attr))
data += blobmsg_hdrlen(be16_to_cpu(hdr->namelen)); data += blobmsg_hdrlen(blobmsg_namelen(hdr));
return data; return data;
} }