netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jan Engelhardt <jengelh@medozas.de>
To: pablo@netfilter.org
Cc: netfilter-devel@vger.kernel.org
Subject: [PATCH 4/5] attr: remove redundant check for NULL
Date: Thu, 11 Nov 2010 00:08:03 +0100	[thread overview]
Message-ID: <1289430485-16467-5-git-send-email-jengelh@medozas.de> (raw)
In-Reply-To: <1289430485-16467-1-git-send-email-jengelh@medozas.de>

Calling mnl_attr_parse with cb==NULL is pointless, because the
function will do nothing else.

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 src/attr.c |    4 ++--
 1 files 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);
 	}
-- 
1.7.1


  parent reply	other threads:[~2010-11-10 23:08 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-11-10 23:07 libmnl misc patches Nov 11 Jan Engelhardt
2010-11-10 23:08 ` [PATCH 1/5] socket: constify a struct sockaddr_nl Jan Engelhardt
2010-11-11 12:56   ` Pablo Neira Ayuso
2010-11-10 23:08 ` [PATCH 2/5] include: use C++ headers in C++ mode Jan Engelhardt
2010-11-11 12:57   ` Pablo Neira Ayuso
2010-11-11 12:59     ` Jan Engelhardt
2010-11-11 13:15       ` Pablo Neira Ayuso
2010-11-13 18:19         ` Jan Engelhardt
2010-11-16 10:04           ` Pablo Neira Ayuso
2013-06-07  8:35   ` Thomas Jarosch
2013-06-08 13:38     ` Jan Engelhardt
2010-11-10 23:08 ` [PATCH 3/5] nlmsg: use bool for all _ok functions Jan Engelhardt
2010-11-11 12:59   ` Pablo Neira Ayuso
2010-11-10 23:08 ` Jan Engelhardt [this message]
2010-11-11 13:02   ` [PATCH 4/5] attr: remove redundant check for NULL Pablo Neira Ayuso
2010-11-10 23:08 ` [PATCH 5/5] attr: avoid multiple definition of hidden variable Jan Engelhardt
2010-11-11 13:08   ` Pablo Neira Ayuso
2010-11-11 13:25     ` Jan Engelhardt
2010-11-11 17:47       ` Pablo Neira Ayuso
2010-11-11 20:53         ` Jan Engelhardt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1289430485-16467-5-git-send-email-jengelh@medozas.de \
    --to=jengelh@medozas.de \
    --cc=netfilter-devel@vger.kernel.org \
    --cc=pablo@netfilter.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).