From patchwork Thu Dec 27 14:12:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Jarosch X-Patchwork-Id: 208299 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D6B772C0085 for ; Fri, 28 Dec 2012 01:12:38 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752747Ab2L0OMh (ORCPT ); Thu, 27 Dec 2012 09:12:37 -0500 Received: from re04.intra2net.com ([82.165.46.26]:52277 "EHLO re04.intra2net.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752446Ab2L0OMg (ORCPT ); Thu, 27 Dec 2012 09:12:36 -0500 Received: from intranator.m.i2n (unknown [172.16.1.99]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by re04.intra2net.com (Postfix) with ESMTP id 924103012A for ; Thu, 27 Dec 2012 15:12:35 +0100 (CET) Received: from localhost (intranator.m.i2n [127.0.0.1]) by localhost (Postfix) with ESMTP id 2A73D2AC57 for ; Thu, 27 Dec 2012 15:12:35 +0100 (CET) X-Virus-Scanned: by Intranator (www.intra2net.com) with AMaViS and F-Secure AntiVirus (fsavdb 2012-12-27_05) X-Spam-Status: X-Spam-Level: 0 Received: from storm.localnet (storm.m.i2n [172.16.1.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by intranator.m.i2n (Postfix) with ESMTPS id 83B242AC54 for ; Thu, 27 Dec 2012 15:12:30 +0100 (CET) From: Thomas Jarosch To: netfilter-devel@vger.kernel.org Subject: [libnetfilter_conntrack PATCH] Fix logic typo in cmp_secctx Date: Thu, 27 Dec 2012 15:12:30 +0100 Message-ID: <4631253.eD7KB7KPU6@storm> User-Agent: KMail/4.9.3 (Linux/3.6.9-2.fc17.x86_64; KDE/4.9.3; x86_64; ; ) MIME-Version: 1.0 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org cppcheck reported: [src/conntrack/compare.c:364] -> [src/conntrack/compare.c:364]: (style) Same expression on both sides of '||'. Signed-off-by: Thomas Jarosch --- 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; }