From patchwork Thu Jan 5 02:13:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Pettit X-Patchwork-Id: 711192 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 3tvB7s132Hz9srY for ; Thu, 5 Jan 2017 13:14:17 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 8CF4AC0C; Thu, 5 Jan 2017 02:13:22 +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 5223CBE7 for ; Thu, 5 Jan 2017 02:13:19 +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 DBE6690 for ; Thu, 5 Jan 2017 02:13:18 +0000 (UTC) Received: from mfilter47-d.gandi.net (mfilter47-d.gandi.net [217.70.178.178]) by relay3-d.mail.gandi.net (Postfix) with ESMTP id BDD79A80CF for ; Thu, 5 Jan 2017 03:13:17 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mfilter47-d.gandi.net Received: from relay3-d.mail.gandi.net ([IPv6:::ffff:217.70.183.195]) by mfilter47-d.gandi.net (mfilter47-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id jkWscfpCeiHr for ; Thu, 5 Jan 2017 03:13:16 +0100 (CET) X-Originating-IP: 208.91.2.3 Received: from localhost.localdomain (unknown [208.91.2.3]) (Authenticated sender: jpettit@ovn.org) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id D937AA80C2 for ; Thu, 5 Jan 2017 03:13:15 +0100 (CET) From: Justin Pettit To: dev@openvswitch.org Date: Wed, 4 Jan 2017 18:13:05 -0800 Message-Id: <1483582391-114359-3-git-send-email-jpettit@ovn.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1483582391-114359-1-git-send-email-jpettit@ovn.org> References: <1483582391-114359-1-git-send-email-jpettit@ovn.org> X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RCVD_IN_SORBS_SPAM 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 3/9] ovn-controller: Remove "_p" from pointer arguments in lflow.c. 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 This more closely follows our coding standards. Signed-off-by: Justin Pettit Acked-by: Ben Pfaff --- ovn/controller/lflow.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/ovn/controller/lflow.c b/ovn/controller/lflow.c index 2aad682..71d8c59 100644 --- a/ovn/controller/lflow.c +++ b/ovn/controller/lflow.c @@ -56,9 +56,9 @@ static void consider_logical_flow(const struct lport_index *lports, const struct hmap *local_datapaths, struct group_table *group_table, const struct simap *ct_zones, - struct hmap *dhcp_opts_p, - struct hmap *dhcpv6_opts_p, - uint32_t *conj_id_ofs_p, + struct hmap *dhcp_opts, + struct hmap *dhcpv6_opts, + uint32_t *conj_id_ofs, const struct shash *addr_sets, struct hmap *flow_table); @@ -137,9 +137,9 @@ consider_logical_flow(const struct lport_index *lports, const struct hmap *local_datapaths, struct group_table *group_table, const struct simap *ct_zones, - struct hmap *dhcp_opts_p, - struct hmap *dhcpv6_opts_p, - uint32_t *conj_id_ofs_p, + struct hmap *dhcp_opts, + struct hmap *dhcpv6_opts, + uint32_t *conj_id_ofs, const struct shash *addr_sets, struct hmap *flow_table) { @@ -170,8 +170,8 @@ consider_logical_flow(const struct lport_index *lports, struct ofpbuf ovnacts = OFPBUF_STUB_INITIALIZER(ovnacts_stub); struct ovnact_parse_params pp = { .symtab = &symtab, - .dhcp_opts = dhcp_opts_p, - .dhcpv6_opts = dhcpv6_opts_p, + .dhcp_opts = dhcp_opts, + .dhcpv6_opts = dhcpv6_opts, .n_tables = LOG_PIPELINE_LEN, .cur_ltable = lflow->table_id, @@ -247,7 +247,7 @@ consider_logical_flow(const struct lport_index *lports, match_set_metadata(&m->match, htonll(lflow->logical_datapath->tunnel_key)); if (m->match.wc.masks.conj_id) { - m->match.flow.conj_id += *conj_id_ofs_p; + m->match.flow.conj_id += *conj_id_ofs; } if (!m->n) { ofctrl_add_flow(flow_table, ptable, lflow->priority, @@ -262,7 +262,7 @@ consider_logical_flow(const struct lport_index *lports, struct ofpact_conjunction *dst; dst = ofpact_put_CONJUNCTION(&conj); - dst->id = src->id + *conj_id_ofs_p; + dst->id = src->id + *conj_id_ofs; dst->clause = src->clause; dst->n_clauses = src->n_clauses; } @@ -275,7 +275,7 @@ consider_logical_flow(const struct lport_index *lports, /* Clean up. */ expr_matches_destroy(&matches); ofpbuf_uninit(&ofpacts); - *conj_id_ofs_p += n_conjs; + *conj_id_ofs += n_conjs; } static void