From patchwork Fri Dec 16 22:25:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Pfaff X-Patchwork-Id: 706610 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 3tgQ2n3nN9z9t2N for ; Sat, 17 Dec 2016 09:29:05 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id E1F8DBDA; Fri, 16 Dec 2016 22:25:59 +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 73BC1A88 for ; Fri, 16 Dec 2016 22:25:56 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 4BA4422F for ; Fri, 16 Dec 2016 22:25:55 +0000 (UTC) Received: from mfilter34-d.gandi.net (mfilter34-d.gandi.net [217.70.178.165]) by relay3-d.mail.gandi.net (Postfix) with ESMTP id 1CE79A80C1; Fri, 16 Dec 2016 23:25:54 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mfilter34-d.gandi.net Received: from relay3-d.mail.gandi.net ([IPv6:::ffff:217.70.183.195]) by mfilter34-d.gandi.net (mfilter34-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id MPRoejQuxSZt; Fri, 16 Dec 2016 23:25:52 +0100 (CET) X-Originating-IP: 208.91.2.3 Received: from sigabrt.benpfaff.org (unknown [208.91.2.3]) (Authenticated sender: blp@ovn.org) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id D2CC1A80C7; Fri, 16 Dec 2016 23:25:51 +0100 (CET) From: Ben Pfaff To: dev@openvswitch.org Date: Fri, 16 Dec 2016 14:25:32 -0800 Message-Id: <20161216222537.2221-7-blp@ovn.org> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161216222537.2221-1-blp@ovn.org> References: <20161216222537.2221-1-blp@ovn.org> X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Ben Pfaff Subject: [ovs-dev] [PATCH v2 06/11] lport: Tolerate null pointers in destroy functions. 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 The coding style says to do this. The actual caller doesn't pass a null pointer. Signed-off-by: Ben Pfaff --- ovn/controller/lport.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ovn/controller/lport.c b/ovn/controller/lport.c index 3484c2c..38aca22 100644 --- a/ovn/controller/lport.c +++ b/ovn/controller/lport.c @@ -68,6 +68,10 @@ lport_index_init(struct lport_index *lports, struct ovsdb_idl *ovnsb_idl) void lport_index_destroy(struct lport_index *lports) { + if (!lports) { + return; + } + /* Destroy all of the "struct lport"s. * * We don't have to remove the node from both indexes. */ @@ -141,6 +145,10 @@ mcgroup_index_init(struct mcgroup_index *mcgroups, struct ovsdb_idl *ovnsb_idl) void mcgroup_index_destroy(struct mcgroup_index *mcgroups) { + if (!mcgroups) { + return; + } + struct mcgroup *mcgroup, *next; HMAP_FOR_EACH_SAFE (mcgroup, next, dp_name_node, &mcgroups->by_dp_name) { hmap_remove(&mcgroups->by_dp_name, &mcgroup->dp_name_node);