From 485d30a8a89e7500b0df4291fa4dfc33b894998c Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 11 Nov 2010 14:01:09 +0100 Subject: attr: remove redundant check for NULL Calling mnl_attr_parse with cb==NULL is pointless, because the function will do nothing else. Signed-off-by: Jan Engelhardt Signed-off-by: Pablo Neira Ayuso --- src/attr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/attr.c b/src/attr.c index 69fda0b..e22a8ac 100644 --- a/src/attr.c +++ b/src/attr.c @@ -260,7 +260,7 @@ int mnl_attr_parse(const struct nlmsghdr *nlh, unsigned int offset, int len = nlh->nlmsg_len - MNL_NLMSG_HDRLEN - MNL_ALIGN(offset); while (mnl_attr_ok(attr, len)) { - if (cb && (ret = cb(attr, data)) <= MNL_CB_STOP) + if ((ret = cb(attr, data)) <= MNL_CB_STOP) return ret; attr = mnl_attr_next(attr, &len); } @@ -289,7 +289,7 @@ int mnl_attr_parse_nested(const struct nlattr *nested, int len = mnl_attr_get_payload_len(nested); while (mnl_attr_ok(attr, len)) { - if (cb && (ret = cb(attr, data)) <= MNL_CB_STOP) + if ((ret = cb(attr, data)) <= MNL_CB_STOP) return ret; attr = mnl_attr_next(attr, &len); } -- cgit v1.2.3