ofp-print: Move much of the printing code into message-specific files.

Until now, the ofp-print code has had a lot of logic specific to
individual messages.  This code is better put with the other code specific
to those messages, so this commit starts to migrate it.

There is more work of a similar type to do, but this is a reasonable start.

Signed-off-by: Ben Pfaff <blp@ovn.org>
Acked-by: Justin Pettit <jpettit@ovn.org>

1 files changed, 5 insertions, 17 deletions

diff --git a/include/openvswitch/ofp-print.h b/include/openvswitch/ofp-print.h
index ed113786a..d76f06872 100644
--- a/include/openvswitch/ofp-print.h
+++ b/include/openvswitch/ofp-print.h
@@ -25,7 +25,6 @@
 #include <openvswitch/types.h>
 
 struct ds;
-struct ofp10_match;
 struct ofp_flow_mod;
 struct ofp_header;
 struct ofputil_flow_stats;
@@ -45,28 +44,17 @@ void ofp_print_packet(FILE *stream, const void *data,
                       size_t len, ovs_be32 packet_type);
 void ofp_print_dp_packet(FILE *stream, const struct dp_packet *packet);
 
-void ofp10_match_print(struct ds *, const struct ofp10_match *,
-                       const struct ofputil_port_map *, int verbosity);
-
 char *ofp_to_string(const void *, size_t, const struct ofputil_port_map *,
                     const struct ofputil_table_map *, int verbosity);
-char *ofp10_match_to_string(const struct ofp10_match *,
-                            const struct ofputil_port_map *, int verbosity);
 char *ofp_packet_to_string(const void *data, size_t len, ovs_be32 packet_type);
 char *ofp_dp_packet_to_string(const struct dp_packet *packet);
 
 void ofp_print_version(const struct ofp_header *, struct ds *);
-void ofp_print_table_features(
-    struct ds *, const struct ofputil_table_features *features,
-    const struct ofputil_table_features *prev_features,
-    const struct ofputil_table_stats *stats,
-    const struct ofputil_table_stats *prev_stats,
-    const struct ofputil_table_map *table_map);
-
-void ofp_print_flow_stats(struct ds *, const struct ofputil_flow_stats *,
-                          const struct ofputil_port_map *,
-                          const struct ofputil_table_map *,
-                          bool show_stats);
+
+void ofp_print_duration(struct ds *, unsigned int sec, unsigned int nsec);
+void ofp_print_bit_names(struct ds *, uint32_t bits,
+                         const char *(*bit_to_name)(uint32_t bit),
+                         char separator);
 
 #ifdef  __cplusplus
 }