* [libnetfilter_conntrack PATCH] Fix logic typo in cmp_secctx
@ 2012-12-27 14:12 Thomas Jarosch
2012-12-27 14:29 ` Florian Westphal
0 siblings, 1 reply; 2+ messages in thread
From: Thomas Jarosch @ 2012-12-27 14:12 UTC (permalink / raw)
To: netfilter-devel
cppcheck reported:
[src/conntrack/compare.c:364] -> [src/conntrack/compare.c:364]: (style) Same expression on both sides of '||'.
Signed-off-by: Thomas Jarosch <thomas.jarosch@intra2net.com>
---
src/conntrack/compare.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/conntrack/compare.c b/src/conntrack/compare.c
index b18f7fc..e282a24 100644
--- a/src/conntrack/compare.c
+++ b/src/conntrack/compare.c
@@ -361,7 +361,7 @@ cmp_secctx(const struct nf_conntrack *ct1,
const struct nf_conntrack *ct2,
unsigned int flags)
{
- if (ct1->secctx == NULL || ct1->secctx == NULL)
+ if (ct1->secctx == NULL || ct2->secctx == NULL)
return ct1->secctx == ct2->secctx;
return strcmp(ct1->secctx, ct2->secctx) == 0;
}
--
1.7.11.7
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [libnetfilter_conntrack PATCH] Fix logic typo in cmp_secctx
2012-12-27 14:12 [libnetfilter_conntrack PATCH] Fix logic typo in cmp_secctx Thomas Jarosch
@ 2012-12-27 14:29 ` Florian Westphal
0 siblings, 0 replies; 2+ messages in thread
From: Florian Westphal @ 2012-12-27 14:29 UTC (permalink / raw)
To: Thomas Jarosch; +Cc: netfilter-devel
Thomas Jarosch <thomas.jarosch@intra2net.com> wrote:
> cppcheck reported:
> [src/conntrack/compare.c:364] -> [src/conntrack/compare.c:364]: (style) Same expression on both sides of '||'.
>
> Signed-off-by: Thomas Jarosch <thomas.jarosch@intra2net.com>
> ---
> src/conntrack/compare.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/conntrack/compare.c b/src/conntrack/compare.c
> index b18f7fc..e282a24 100644
> --- a/src/conntrack/compare.c
> +++ b/src/conntrack/compare.c
> @@ -361,7 +361,7 @@ cmp_secctx(const struct nf_conntrack *ct1,
> const struct nf_conntrack *ct2,
> unsigned int flags)
> {
> - if (ct1->secctx == NULL || ct1->secctx == NULL)
> + if (ct1->secctx == NULL || ct2->secctx == NULL)
Grrr, my fault.
Applied, thanks for fixing this.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-12-27 14:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-27 14:12 [libnetfilter_conntrack PATCH] Fix logic typo in cmp_secctx Thomas Jarosch
2012-12-27 14:29 ` Florian Westphal
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).