ofp-parse: Generalize parse_ofp_add_flow_file() to parse_ofp_flow_mod_file().

An upcoming commit will want to pass a different command.

2 files changed, 4 insertions, 3 deletions

diff --git a/utilities/ovs-controller.c b/utilities/ovs-controller.c
index f5e501437..af9e11f0d 100644
--- a/utilities/ovs-controller.c
+++ b/utilities/ovs-controller.c
@@ -269,7 +269,8 @@ read_flow_file(const char *name)
     }
 
     flow_format = NXFF_OPENFLOW10;
-    while (parse_ofp_add_flow_file(&default_flows, &flow_format, stream)) {
+    while (parse_ofp_flow_mod_file(&default_flows, &flow_format, stream,
+                                   OFPFC_ADD)) {
         continue;
     }
 
diff --git a/utilities/ovs-ofctl.c b/utilities/ovs-ofctl.c
index e7997c61e..6c476951b 100644
--- a/utilities/ovs-ofctl.c
+++ b/utilities/ovs-ofctl.c
@@ -674,7 +674,7 @@ do_add_flows(int argc OVS_UNUSED, char *argv[])
     flow_format = set_initial_format_for_flow_mod(&requests);
 
     open_vconn(argv[1], &vconn);
-    while (parse_ofp_add_flow_file(&requests, &flow_format, file)) {
+    while (parse_ofp_flow_mod_file(&requests, &flow_format, file, OFPFC_ADD)) {
         check_final_format_for_flow_mod(flow_format);
         transact_multiple_noreply(vconn, &requests);
     }
@@ -1339,7 +1339,7 @@ do_parse_flows(int argc OVS_UNUSED, char *argv[])
     }
 
     list_init(&packets);
-    while (parse_ofp_add_flow_file(&packets, &flow_format, file)) {
+    while (parse_ofp_flow_mod_file(&packets, &flow_format, file, OFPFC_ADD)) {
         print_packet_list(&packets);
     }
     fclose(file);