From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 33BD3C282C3 for ; Thu, 24 Jan 2019 20:30:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0489F2184C for ; Thu, 24 Jan 2019 20:30:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=networkplumber-org.20150623.gappssmtp.com header.i=@networkplumber-org.20150623.gappssmtp.com header.b="uKajLEYh" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727618AbfAXUa0 (ORCPT ); Thu, 24 Jan 2019 15:30:26 -0500 Received: from mail-pg1-f194.google.com ([209.85.215.194]:37753 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725974AbfAXUaZ (ORCPT ); Thu, 24 Jan 2019 15:30:25 -0500 Received: by mail-pg1-f194.google.com with SMTP id c25so3169329pgb.4 for ; Thu, 24 Jan 2019 12:30:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=AzxpyYigzJNIdBG1/XkcTiPYWhQTNeIMgp+z7On6Odo=; b=uKajLEYht0fJ5mDS8a3gza77wVlU7LH7/x2ympNyuFqYnY1QdgvQ+9fNDgjhM6HZ+R ufMceMaiu1W2iv0rtwZMGfM5H689FKH+PkiizSeJ+isxOMWFGlfkZbPiRKoiN47s/KWJ kZ9kb6EEMIfm5gwBXktcFiG5GtRtI7O3qnnA//+gVAtivl4yvLlzxAcGCC4Z35BrG0oi P4xp4D9UqliYIM4ljmgd8KQslYDKYVbzhFURcgOLdWSJ+URhUnf0NvUWj8ZnSBBACBnF MrxwQM9PecCG6RuTj8NxzzNtMJ9svl9QlmXJ8y6HupCk/0y52R7Jj2NSZ/93WxCTBbTU 7meA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=AzxpyYigzJNIdBG1/XkcTiPYWhQTNeIMgp+z7On6Odo=; b=YxnXQ7udPMLgQiKdEaJhY1BDUTmgf8V6aN+4f6SDasvmr/UJKPj89VIKiggNHzVdKI zNTrpcSY+s/JnJGyu6tkpCcTWXmTo2lkXKr1dldtSBOPjQxjfVQzIFMrVBcbx9ENzeZd MSr7Dt5Zr74jIJ5Yvhf431xVx2Bn+kXKWrlstn4hfPjFV/qYZ4l6C4rzqKFH9SOEuUKo eU81X6XVEdnpJTOL8Wj9fVTJwH9zof7LabGrkkXaWwLV0uYqlmNWqh9fmGOAzbkUyBK5 5I5GihNrt79154dDbHnF/4vFk781FRzkVr3Wh2c+2e9iAqabRllu5WlxwuUlul3BO9BL SBBg== X-Gm-Message-State: AJcUukcmpOO742udkF4hv/ugzFOpJXzkbsj42+PeaImMVX7z+uBTpvrl toi+Eu3q6Ec5i5tcF6w066+TpL85gLJFJg== X-Google-Smtp-Source: ALg8bN7vN3hkx9FFt/1k9QyiXOIWRs3ogq586f78AAIgMFJSevp2Nmf7r513sSFLn2wo0pBZstMJ3Q== X-Received: by 2002:a62:5d0c:: with SMTP id r12mr8298736pfb.0.1548361823954; Thu, 24 Jan 2019 12:30:23 -0800 (PST) Received: from shemminger-XPS-13-9360.canterbury.ac.nz ([202.36.179.100]) by smtp.gmail.com with ESMTPSA id d129sm46462903pfc.31.2019.01.24.12.30.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Jan 2019 12:30:23 -0800 (PST) From: Stephen Hemminger To: netdev@vger.kernel.org Cc: Stephen Hemminger Subject: [PATCH iproute2-next 2/2] tc: replace left side comparison Date: Fri, 25 Jan 2019 09:30:14 +1300 Message-Id: <20190124203014.7450-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190124203014.7450-1-stephen@networkplumber.org> References: <20190124203014.7450-1-stephen@networkplumber.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The kernel (and iproute2) don't use the if (NULL == x) style and instead prefer if (!x) Signed-off-by: Stephen Hemminger --- tc/m_action.c | 2 +- tc/m_ipt.c | 3 +-- tc/m_xt_old.c | 3 +-- tc/tc_util.c | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/tc/m_action.c b/tc/m_action.c index d5fd5affe703..b5aff3ab4896 100644 --- a/tc/m_action.c +++ b/tc/m_action.c @@ -363,7 +363,7 @@ tc_print_action(FILE *f, const struct rtattr *arg, unsigned short tot_acts) parse_rtattr_nested(tb, tot_acts, arg); - if (tab_flush && NULL != tb[0] && NULL == tb[1]) + if (tab_flush && tb[0] && !tb[1]) return tc_print_action_flush(f, tb[0]); open_json_array(PRINT_JSON, "actions"); diff --git a/tc/m_ipt.c b/tc/m_ipt.c index b48cc0a9c85f..1d73cb98895a 100644 --- a/tc/m_ipt.c +++ b/tc/m_ipt.c @@ -299,9 +299,8 @@ static int parse_ipt(struct action_util *a, int *argc_p, int i; for (i = 0; i < rargc; i++) { - if (NULL == argv[i] || 0 == strcmp(argv[i], "action")) { + if (!argv[i] || strcmp(argv[i], "action") == 0) break; - } } iargc = argc = i; } diff --git a/tc/m_xt_old.c b/tc/m_xt_old.c index 313bea61cc7e..25d367785786 100644 --- a/tc/m_xt_old.c +++ b/tc/m_xt_old.c @@ -224,9 +224,8 @@ static int parse_ipt(struct action_util *a, int *argc_p, int i; for (i = 0; i < rargc; i++) { - if (NULL == argv[i] || 0 == strcmp(argv[i], "action")) { + if (!argv[i] || strcmp(argv[i], "action") == 0) break; - } } iargc = argc = i; } diff --git a/tc/tc_util.c b/tc/tc_util.c index ab717890bb2a..1dfdae141f4d 100644 --- a/tc/tc_util.c +++ b/tc/tc_util.c @@ -857,7 +857,7 @@ void print_tcstats_attr(FILE *fp, struct rtattr *tb[], char *prefix, struct rtat if (tb[TCA_STATS2]) { print_tcstats2_attr(fp, tb[TCA_STATS2], prefix, xstats); - if (xstats && NULL == *xstats) + if (xstats && !*xstats) goto compat_xstats; return; } -- 2.17.1