genl: make l_genl_attr_recurse take a const pointer
PATCH 1/2 genl: make l_genl_attr_recurse take a const pointer
The outer attribute iterator should be const since its not being modified.
--- ell/genl.c | 2 +- ell/genl.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)
ell/genl.c +1 -1
@@ -1761,7 +1761,7 @@ LIB_EXPORT bool l_genl_attr_next(struct l_genl_attr *attr,return true; } -LIB_EXPORT bool l_genl_attr_recurse(struct l_genl_attr *attr, +LIB_EXPORT bool l_genl_attr_recurse(const struct l_genl_attr *attr,struct l_genl_attr *nested) {const struct nlattr *nla;
ell/genl.h +2 -1
@@ -109,7 +109,8 @@ bool l_genl_msg_leave_nested(struct l_genl_msg *msg);bool l_genl_attr_init (struct l_genl_attr *attr,struct l_genl_msg *msg);bool l_genl_attr_next (struct l_genl_attr *attr,uint16_t *type,uint16_t *len,const void **data); -bool l_genl_attr_recurse (struct l_genl_attr *attr,struct l_genl_attr *nested); +bool l_genl_attr_recurse (const struct l_genl_attr *attr, +struct l_genl_attr *nested);bool l_genl_family_info_has_group (const struct l_genl_family_info *info,const char *group);
Signature · 1 line
2.34.3
PATCH 2/2 genl: remove 'msg' from l_genl_attr
The original l_genl_msg object was never being used
--- ell/genl.c | 2 -- ell/genl.h | 1 - 2 files changed, 3 deletions(-)
ell/genl.c +0 -2
@@ -1720,7 +1720,6 @@ LIB_EXPORT bool l_genl_attr_init(struct l_genl_attr *attr,if (!NLA_OK (nla, len))return false; - attr->msg = msg; attr->data =NULL ; attr->len =0 ; attr->next_data = nla;
@@ -1773,7 +1772,6 @@ LIB_EXPORT bool l_genl_attr_recurse(const struct l_genl_attr *attr,if (!nla)return false; - nested->msg = attr->msg; nested->data =NULL ; nested->len =0 ; nested->next_data =NLA_DATA (nla);
ell/genl.h +0 -1
@@ -76,7 +76,6 @@ bool l_genl_request_family(struct l_genl *genl, const char *name, l_genl_destroy_func_t destroy);struct l_genl_attr { -struct l_genl_msg *msg;const void *data;uint32_t len;const void *next_data;
Signature · 1 line
2.34.3
Hi James,
Quoted 7 lines · James Prestwood
The outer attribute iterator should be const since its not being modified.
--- ell/genl.c | 2 +- ell/genl.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)
Both applied, thanks.
Regards,
-Denis