diff mbox series

[ovs-dev,06/10] ofp-actions: Improve a few error messages.

Message ID 20190430232728.31093-6-blp@ovn.org
State Accepted
Commit 9f0721e989fcaee69882130e31bc4ce223d7f59d
Headers show
Series [ovs-dev,01/10] ofp-actions: Make encap action really require OF1.3+. | expand

Commit Message

Ben Pfaff April 30, 2019, 11:27 p.m. UTC 
Signed-off-by: Ben Pfaff <blp@ovn.org>
---
 lib/multipath.c   | 4 ++--
 lib/ofp-actions.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
diff mbox series

Patch

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;
 }