From patchwork Tue Mar 21 13:23:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simran Singhal X-Patchwork-Id: 741530 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3vnYSP0HgPz9s7l for ; Wed, 22 Mar 2017 00:24:21 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="EahL0Xti"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932658AbdCUNXo (ORCPT ); Tue, 21 Mar 2017 09:23:44 -0400 Received: from mail-pg0-f66.google.com ([74.125.83.66]:35175 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932499AbdCUNXl (ORCPT ); Tue, 21 Mar 2017 09:23:41 -0400 Received: by mail-pg0-f66.google.com with SMTP id g2so25159878pge.2; Tue, 21 Mar 2017 06:23:35 -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=1zvyKyC86dFeL3A9VsXh99IQYbN8B7Tdhx6gXaxUlNM=; b=EahL0Xtimd6qFpoFyHBXQlzJPNJJfsxb73lNTE0WznLhOqbjC68STLATjSDdTE0UI6 fHQhSR/QBQp3Oo+ZjzvFC7ICarvcnGMjA8Hb/2ee26Hb2+PYjNsvVZ6a1dcnWlHW/gYj ny0WEcRZvrf+v2qeggkqdXxc6tJzORKZ7PU24OLqLnb6ajdtkjuCqtseUskr1QNt113q rsx/Mvsncb+zDDFuLtIkhAqo87Xd2jQnIfDez4uULXQNmkSIZjQOKUKJOpYQfGGGimB6 uSfwV/Dh/0yDzDUtJQxqNrJHNL0NpgAZJzkd7ZzpFEZmcKzmw63Yo8lWp/q3uOqbKOsc 8x1g== 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=1zvyKyC86dFeL3A9VsXh99IQYbN8B7Tdhx6gXaxUlNM=; b=SqQWOe0o8FDjwKnXeLiWmREa5s071M946+YaXkkTZH0tiv9+ATqxDK3lvFl6Dv7rzt wxEdMplZl83tUPtGFkfQg3IIhOj2YDu9iRhbFkXE/o/2Jz2F8MS+4GBuWz15Mj/DK+Ls SvCD3OwMLH2KGk+lfr8tormSnOGUywqeeLDd5PBz8Kzr9CMkDJTVqWtN5AN9i6aRBlyT DACqlt/K7Tn2Kbud7+VexxV30rI+y95f8qa+Yhlcbo3GEn/2UZtfsuTw5N1aIJ0LS1mM enbOR0weICD9QKUEeYqXu7RMWU2tRJKlUkbULvzWArUQ9qzwUWY5B9A5lgGzkqDiUFa2 aR7g== X-Gm-Message-State: AFeK/H2t8cj41fQKrTEdMMrW1qMaGdSQMTMXehJUU5pX++/PIT33VG0zjvUoEpdr0ZqhvQ== X-Received: by 10.98.108.1 with SMTP id h1mr24665730pfc.95.1490102605464; Tue, 21 Mar 2017 06:23:25 -0700 (PDT) Received: from singhal-Inspiron-5558 ([14.139.82.6]) by smtp.gmail.com with ESMTPSA id e13sm40078308pgf.48.2017.03.21.06.23.24 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 21 Mar 2017 06:23:25 -0700 (PDT) From: simran singhal To: pablo@netfilter.org Cc: kadlec@blackhole.kfki.hu, davem@davemloft.net, netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, gregkh@linuxfoundation.org, outreachy-kernel@googlegroups.com, wensong@linux-vs.org, horms@verge.net.au, ja@ssi.bg Subject: [PATCH 1/2] netfilter: ipset: Compress return logic Date: Tue, 21 Mar 2017 18:53:18 +0530 Message-Id: <1490102599-27579-2-git-send-email-singhalsimran0@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1490102599-27579-1-git-send-email-singhalsimran0@gmail.com> References: <1490102599-27579-1-git-send-email-singhalsimran0@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Simplify function returns by merging assignment and return into one command line. Signed-off-by: simran singhal --- --This is my contribution to the netfilter project of Outreachy Round 14. net/netfilter/ipset/ip_set_list_set.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/net/netfilter/ipset/ip_set_list_set.c b/net/netfilter/ipset/ip_set_list_set.c index 178d4eb..2fff6b5 100644 --- a/net/netfilter/ipset/ip_set_list_set.c +++ b/net/netfilter/ipset/ip_set_list_set.c @@ -453,7 +453,6 @@ static size_t list_set_memsize(const struct list_set *map, size_t dsize) { struct set_elem *e; - size_t memsize; u32 n = 0; rcu_read_lock(); @@ -461,9 +460,7 @@ list_set_memsize(const struct list_set *map, size_t dsize) n++; rcu_read_unlock(); - memsize = sizeof(*map) + n * dsize; - - return memsize; + return (sizeof(*map) + n * dsize); } static int