[ovs-dev,4/6] ofp-flow: Move parse_ofp_flow_mod_str() into correct file.

Message ID 20180216225445.28688-4-blp@ovn.org
State Accepted
Headers show
Series
  • [ovs-dev,1/6] ofp-util: Use consistent naming convention.
Related show

Commit Message

Ben Pfaff Feb. 16, 2018, 10:54 p.m.
This function was left behind by accident in the patch that split up
ofp-parse.

Signed-off-by: Ben Pfaff <blp@ovn.org>
---
 lib/ofp-flow.c  | 30 ++++++++++++++++++++++++++++++
 lib/ofp-parse.c | 30 ------------------------------
 2 files changed, 30 insertions(+), 30 deletions(-)

Comments

Justin Pettit March 13, 2018, 1:24 a.m. | #1
> On Feb 16, 2018, at 2:54 PM, Ben Pfaff <blp@ovn.org> wrote:
> 
> This function was left behind by accident in the patch that split up
> ofp-parse.
> 
> Signed-off-by: Ben Pfaff <blp@ovn.org>

Acked-by: Justin Pettit <jpettit@ovn.org>

--Justin

Patch

diff --git a/lib/ofp-flow.c b/lib/ofp-flow.c
index af6be74909e6..10d6825991f6 100644
--- a/lib/ofp-flow.c
+++ b/lib/ofp-flow.c
@@ -1377,6 +1377,36 @@  parse_ofp_str(struct ofputil_flow_mod *fm, int command, const char *str_,
     return error;
 }
 
+/* Parses 'string' as an OFPT_FLOW_MOD or NXT_FLOW_MOD with command 'command'
+ * (one of OFPFC_*) into 'fm'.
+ *
+ * If 'command' is given as -2, 'string' may begin with a command name ("add",
+ * "modify", "delete", "modify_strict", or "delete_strict").  A missing command
+ * name is treated as "add".
+ *
+ * Returns NULL if successful, otherwise a malloc()'d string describing the
+ * error.  The caller is responsible for freeing the returned string. */
+char * OVS_WARN_UNUSED_RESULT
+parse_ofp_flow_mod_str(struct ofputil_flow_mod *fm, const char *string,
+                       const struct ofputil_port_map *port_map,
+                       const struct ofputil_table_map *table_map,
+                       int command,
+                       enum ofputil_protocol *usable_protocols)
+{
+    char *error = parse_ofp_str(fm, command, string, port_map, table_map,
+                                usable_protocols);
+
+    if (!error) {
+        /* Normalize a copy of the match.  This ensures that non-normalized
+         * flows get logged but doesn't affect what gets sent to the switch, so
+         * that the switch can do whatever it likes with the flow. */
+        struct match match_copy = fm->match;
+        ofputil_normalize_match(&match_copy);
+    }
+
+    return error;
+}
+
 /* Opens file 'file_name' and reads each line as a flow_mod of the specified
  * type (one of OFPFC_*).  Stores each flow_mod in '*fm', an array allocated
  * on the caller's behalf, and the number of flow_mods in '*n_fms'.
diff --git a/lib/ofp-parse.c b/lib/ofp-parse.c
index 3e8b553f9e1b..9fbfe76639f0 100644
--- a/lib/ofp-parse.c
+++ b/lib/ofp-parse.c
@@ -248,36 +248,6 @@  ofp_extract_actions(char *s)
         return NULL;
     }
 }
-
-/* Parses 'string' as an OFPT_FLOW_MOD or NXT_FLOW_MOD with command 'command'
- * (one of OFPFC_*) into 'fm'.
- *
- * If 'command' is given as -2, 'string' may begin with a command name ("add",
- * "modify", "delete", "modify_strict", or "delete_strict").  A missing command
- * name is treated as "add".
- *
- * Returns NULL if successful, otherwise a malloc()'d string describing the
- * error.  The caller is responsible for freeing the returned string. */
-char * OVS_WARN_UNUSED_RESULT
-parse_ofp_flow_mod_str(struct ofputil_flow_mod *fm, const char *string,
-                       const struct ofputil_port_map *port_map,
-                       const struct ofputil_table_map *table_map,
-                       int command,
-                       enum ofputil_protocol *usable_protocols)
-{
-    char *error = parse_ofp_str(fm, command, string, port_map, table_map,
-                                usable_protocols);
-
-    if (!error) {
-        /* Normalize a copy of the match.  This ensures that non-normalized
-         * flows get logged but doesn't affect what gets sent to the switch, so
-         * that the switch can do whatever it likes with the flow. */
-        struct match match_copy = fm->match;
-        ofputil_normalize_match(&match_copy);
-    }
-
-    return error;
-}
 
 static size_t
 parse_value(const char *s, const char *delimiters)