From patchwork Tue Apr 30 23:27:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Pfaff X-Patchwork-Id: 1093514 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=none (p=none dis=none) header.from=ovn.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 44tySf5dt0z9s5c for ; Wed, 1 May 2019 09:30:42 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 805CC1F3D; Tue, 30 Apr 2019 23:28:25 +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 371CF1C5A for ; Tue, 30 Apr 2019 23:27:44 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id A3ADB5F4 for ; Tue, 30 Apr 2019 23:27:43 +0000 (UTC) X-Originating-IP: 66.170.99.95 Received: from sigill.benpfaff.org (unknown [66.170.99.95]) (Authenticated sender: blp@ovn.org) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 5214B1C0006; Tue, 30 Apr 2019 23:27:41 +0000 (UTC) From: Ben Pfaff To: dev@openvswitch.org Date: Tue, 30 Apr 2019 16:27:24 -0700 Message-Id: <20190430232728.31093-6-blp@ovn.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190430232728.31093-1-blp@ovn.org> References: <20190430232728.31093-1-blp@ovn.org> MIME-Version: 1.0 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 06/10] ofp-actions: Improve a few error messages. 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: , Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org Signed-off-by: Ben Pfaff --- lib/multipath.c | 4 ++-- lib/ofp-actions.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/multipath.c b/lib/multipath.c index 43a3d8f30466..6896f94a1e2b 100644 --- a/lib/multipath.c +++ b/lib/multipath.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2011, 2012, 2013, 2014, 2016, 2017 Nicira, Inc. + * Copyright (c) 2010, 2011, 2012, 2013, 2014, 2016, 2017, 2019 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -202,7 +202,7 @@ multipath_parse__(struct ofpact_multipath *mp, const char *s_, char *s) } if (!mf_nxm_header(mp->dst.field->id)) { return xasprintf("%s: experimenter OXM field '%s' not supported", - s, dst); + s_, dst); } if (mp->dst.n_bits < 16 && n_links > (1u << mp->dst.n_bits)) { return xasprintf("%s: %d-bit destination field has %u possible " diff --git a/lib/ofp-actions.c b/lib/ofp-actions.c index 6efa0accf473..cabd5a05e1f4 100644 --- a/lib/ofp-actions.c +++ b/lib/ofp-actions.c @@ -4881,7 +4881,7 @@ parse_RESUBMIT(char *arg, const struct ofpact_parse_params *pp) if (resubmit->in_port == OFPP_IN_PORT && resubmit->table_id == 255) { return xstrdup("at least one \"in_port\" or \"table\" must be " - "specified on resubmit"); + "specified on resubmit"); } return NULL; }