From patchwork Fri Aug 9 07:11:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damijan Skvarc X-Patchwork-Id: 1144454 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="cvcIiIgv"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 464bz71D9Tz9s3Z for ; Fri, 9 Aug 2019 17:12:17 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 18CC2C4E; Fri, 9 Aug 2019 07:12:05 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 09C4EBE4 for ; Fri, 9 Aug 2019 07:12:04 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-ed1-f65.google.com (mail-ed1-f65.google.com [209.85.208.65]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 5871776F for ; Fri, 9 Aug 2019 07:12:03 +0000 (UTC) Received: by mail-ed1-f65.google.com with SMTP id h8so5739653edv.7 for ; Fri, 09 Aug 2019 00:12:03 -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=sBwxTonxTbc03AydtFKsgvIfd7zRPqz/0QhtiWFXIr0=; b=cvcIiIgvVnbz1oxTawVRmkahU538DdUb86bUllRgaE/xJoLBt9Aa29SBoV9kpPJSob 5ynjiN4aFlqElgvBZrp7ZqJE+AVtuNFZ6eibjc7J30PcUv0GjuGL5y1Mo+6N9ILYXe3Z c2pW1a8HxXr9xQE7N+fN8BnXAYeShrUvxc0a75Uy0Oyy5meJAJZ1KfGWmWa5nNRJO9Lt QHGbzoEGwiB/b50Jeb3pfSTVjbPUnyLCEEgdX0m8dagKzjPkdDI/UGSqVpMjitjV7gPb 7z34JkoudX4Y5b9Uo+NlfNGzFE+v0NN3FCEZ0jWi145ro994hX4jPPX6ySv42y8Q4g67 fP1w== 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=sBwxTonxTbc03AydtFKsgvIfd7zRPqz/0QhtiWFXIr0=; b=Irm5HA3cmrgkxx5Ujzmsi58mKWt3bGCss0bxnDXVqTycghVvUooxFXpAkiFbsyTUW2 ba/UXtYT35KLO5Ct1mrndbFJDa5v03UDg3bOcKR+k6BHNLkDpSRd08j5q4OekS/2K4OE W46BvlitR7CPkYM9IhQsuhl2D6+XAaX5uM6Zk3W6fH0g9mCUJSPlHjhM7sjMMKK0XUy6 vpNbKPDdopg2/uKfbW4TGU4/XX2ZT+WK9nALMQWsFi25PsauzTvOAGZWHZrUGo6sf0EE k8xvBmHJhBRDwOCxoMl9MU17vzCh8KrxzMau5300XAR+5ZdVebN/cDAghoVdePcSOeY8 A0tQ== X-Gm-Message-State: APjAAAUspWmJeUFQpSYmXutdwOi5GkTKVloURlfoXBSzJr4eaU70X6il 1CCHdGvhMRpIfrUFSop+WkqS++i7 X-Google-Smtp-Source: APXvYqwB9p/TZp3sGasdngnmwVsxJRKDPPikOYQ6T5Tpqw6p9fdW0g90WmmvXcgj5v3fxMsjkaQSaQ== X-Received: by 2002:a50:9177:: with SMTP id f52mr20453862eda.294.1565334721589; Fri, 09 Aug 2019 00:12:01 -0700 (PDT) Received: from damijan-PC.i-tech.local (mail.i-tech.si. [89.212.78.105]) by smtp.gmail.com with ESMTPSA id f21sm21757633edj.36.2019.08.09.00.12.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 09 Aug 2019 00:12:00 -0700 (PDT) From: Damijan Skvarc To: dev@openvswitch.org Date: Fri, 9 Aug 2019 09:11:47 +0200 Message-Id: <1565334707-29894-1-git-send-email-damjan.skvarc@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH v2 ovn] logical-fields: fix memory leak while initializing ovnfield_by_name X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org According to comments I have: - renamed function name to be "paired" with ovn_destroy_ovnfields - replaced 0/1 bool values with false/true Signed-off-by: Damijan Skvarc --- lib/logical-fields.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/logical-fields.c b/lib/logical-fields.c index fdc78cf..8a0ef62 100644 --- a/lib/logical-fields.c +++ b/lib/logical-fields.c @@ -58,18 +58,18 @@ add_ct_bit(const char *name, int index, struct shash *symtab) } static void -init_ovnfield_by_name(void) +ovn_init_ovnfields(void) { - static bool initialized = 0; + static bool initialized = false; - if (0 == initialized) { + if (!initialized) { shash_init(&ovnfield_by_name); for (int i = 0; i < OVN_FIELD_N_IDS; i++) { const struct ovn_field *of = &ovn_fields[i]; ovs_assert(of->id == i); /* Fields must be in the enum order. */ shash_add_once(&ovnfield_by_name, of->name, of); } - initialized = 1; + initialized = true; } } @@ -234,7 +234,7 @@ ovn_init_symtab(struct shash *symtab) expr_symtab_add_field(symtab, "sctp.src", MFF_SCTP_SRC, "sctp", false); expr_symtab_add_field(symtab, "sctp.dst", MFF_SCTP_DST, "sctp", false); - init_ovnfield_by_name(); + ovn_init_ovnfields(); expr_symtab_add_ovn_field(symtab, "icmp4.frag_mtu", OVN_ICMP4_FRAG_MTU); }