From patchwork Fri Mar 31 16:13:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arushi Singhal X-Patchwork-Id: 745709 X-Patchwork-Delegate: pablo@netfilter.org 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 3vvmln0x4Dz9ryv for ; Sat, 1 Apr 2017 03:14:13 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="mEVQTC1k"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933224AbdCaQON (ORCPT ); Fri, 31 Mar 2017 12:14:13 -0400 Received: from mail-pg0-f65.google.com ([74.125.83.65]:35181 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933126AbdCaQOM (ORCPT ); Fri, 31 Mar 2017 12:14:12 -0400 Received: by mail-pg0-f65.google.com with SMTP id g2so18325634pge.2 for ; Fri, 31 Mar 2017 09:14:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=uD2sPx5W9ihzgdsYl6owdb0cEf2oz7R9mvIxn1fnZRU=; b=mEVQTC1k42yd3grm0RADcmx928kxsBYIyY+X/CLxFV+L+t130lchzNP8H8UzyjWUFh PVE3abxSsGhXqank3TtKbGLA+X1x3JrcYDi4AJbKIUkPo052i/fhltubAQP+VGx/XxAC g69rGmNkrm6/0yzYvP4xNh4P05+XGhuPdKVCXwuxKaHFibcIDa4Gv1EP1O78TgF3qGqf tZVl76Eg0hxZ/udO7LPw+TN3xW3MSjLr/99TGn+1POs5mTZ/M4f7xPGS78pb/5qTHQlz OmjZVcUyfrNuNCLh7tNtKN8Fft6/NM6muS2xByaYACpA3eZpT2xtznCokWUdJE6JJf8u 4mCQ== 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=uD2sPx5W9ihzgdsYl6owdb0cEf2oz7R9mvIxn1fnZRU=; b=WVnS5fKQD6//yIwBtZJ3bA2192ZqAXj3nkQl4MjhqWTEUcFm9QUoZi5lGGtwCAoYkn nlFPJPtFcnowc7bPFd+OdnR1NiBUqUweOJlOJxpXG4Ig/1TAqHa3aoCayLf/uKKCg0T0 xdBKLn0wu0fbh6kf9T8SMwtPD/9b/94zbWH3TrZdmTnpd/qG3POPDx4uyPiVjqrQTYEE 7ruq7/Hr3gf39oK1wRgH5A+Fol8TvnwBo2Ik4wxZoD2Md6/xBS3MUxx58dOzA7NPkGTQ QKsS/mdjJ42XcZyBSUxZ4rm14RnTvfpaV4ahV6UOnbXbe/J4ALzy6XnfUbRTknIzrKBc ZWiw== X-Gm-Message-State: AFeK/H2aK8jqY3oPXgzuNCyt4yD7AgRh4IBdSl0/KvF+IlnzAfNbvUvqsWJVM7n1+yppkw== X-Received: by 10.99.144.65 with SMTP id a62mr4102058pge.151.1490976851449; Fri, 31 Mar 2017 09:14:11 -0700 (PDT) Received: from arushi-HP-Pavilion-Notebook ([14.139.82.6]) by smtp.gmail.com with ESMTPSA id d63sm11463393pfg.132.2017.03.31.09.14.09 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 31 Mar 2017 09:14:10 -0700 (PDT) From: Arushi Singhal To: netfilter-devel@vger.kernel.org Cc: Arushi Singhal Subject: [PATCH 2/4] iptables: iptables: Remove assignment in if condition Date: Fri, 31 Mar 2017 21:43:49 +0530 Message-Id: <20170331161351.26141-3-arushisinghal19971997@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170331161351.26141-1-arushisinghal19971997@gmail.com> References: <20170331161351.26141-1-arushisinghal19971997@gmail.com> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Remove the assignment from if condition to follow kernel coding style and make the code more clear and readable. Signed-off-by: Arushi Singhal --- iptables/getethertype.c | 3 ++- iptables/nft-arp.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/iptables/getethertype.c b/iptables/getethertype.c index bf3e408..11c121a 100644 --- a/iptables/getethertype.c +++ b/iptables/getethertype.c @@ -84,7 +84,8 @@ struct ethertypeent *getethertypeent(void) } again: - if ((e = fgets(line, BUFSIZ, etherf)) == NULL) { + e = fgets(line, BUFSIZ, etherf); + if (!e) { return (NULL); } if (*e == '#') diff --git a/iptables/nft-arp.c b/iptables/nft-arp.c index 0e13b8c..37ed956 100644 --- a/iptables/nft-arp.c +++ b/iptables/nft-arp.c @@ -70,7 +70,8 @@ addr_to_network(const struct in_addr *addr) { struct netent *net; - if ((net = getnetbyaddr((long) ntohl(addr->s_addr), AF_INET)) != NULL) + net = getnetbyaddr((long) ntohl(addr->s_addr), AF_INET); + if (net) return (char *) net->n_name; return (char *) NULL;