Move ofp-parse.h to include/openvswitch directory

Signed-off-by: Ben Warren <[email protected]> Signed-off-by: Ben Pfaff <[email protected]>
lzg19 · Mar 30, 2016 · 7888d2a · 7888d2a
1 parent 417e7e6
commit 7888d2a
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 14 deletions.
diff --git a/include/openvswitch/automake.mk b/include/openvswitch/automake.mk
@@ -5,6 +5,7 @@ openvswitchinclude_HEADERS = \
 	include/openvswitch/geneve.h \
 	include/openvswitch/list.h \
 	include/openvswitch/ofp-errors.h \
+	include/openvswitch/ofp-parse.h \
 	include/openvswitch/thread.h \
 	include/openvswitch/token-bucket.h \
 	include/openvswitch/types.h \

diff --git a/lib/ofp-parse.h → include/openvswitch/ofp-parse.h b/lib/ofp-parse.h → include/openvswitch/ofp-parse.h
@@ -16,13 +16,13 @@
 
 /* OpenFlow protocol string to flow parser. */
 
-#ifndef OFP_PARSE_H
-#define OFP_PARSE_H 1
+#ifndef OPENVSWITCH_OFP_PARSE_H
+#define OPENVSWITCH_OFP_PARSE_H 1
 
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
-#include "compiler.h"
+#include "openvswitch/compiler.h"
 #include "openvswitch/types.h"
 
 struct flow;

diff --git a/lib/automake.mk b/lib/automake.mk
@@ -145,7 +145,6 @@ lib_libopenvswitch_la_SOURCES = \
 	lib/ofp-msgs.c \
 	lib/ofp-msgs.h \
 	lib/ofp-parse.c \
-	lib/ofp-parse.h \
 	lib/ofp-print.c \
 	lib/ofp-print.h \
 	lib/ofp-prop.c \

diff --git a/lib/dpctl.c b/lib/dpctl.c
@@ -39,7 +39,6 @@
 #include "netdev-dpdk.h"
 #include "netlink.h"
 #include "odp-util.h"
-#include "ofp-parse.h"
 #include "ofpbuf.h"
 #include "ovs-numa.h"
 #include "packets.h"
@@ -50,6 +49,7 @@
 #include "timeval.h"
 #include "unixctl.h"
 #include "util.h"
+#include "openvswitch/ofp-parse.h"
 
 typedef int dpctl_command_handler(int argc, const char *argv[],
                                   struct dpctl_params *);

diff --git a/lib/learning-switch.c b/lib/learning-switch.c
@@ -32,7 +32,6 @@
 #include "ofpbuf.h"
 #include "ofp-actions.h"
 #include "ofp-msgs.h"
-#include "ofp-parse.h"
 #include "ofp-print.h"
 #include "ofp-util.h"
 #include "openflow/openflow.h"
@@ -42,6 +41,7 @@
 #include "simap.h"
 #include "timeval.h"
 #include "openvswitch/ofp-errors.h"
+#include "openvswitch/ofp-parse.h"
 #include "openvswitch/vconn.h"
 #include "openvswitch/vlog.h"
 

diff --git a/lib/ofp-actions.c b/lib/ofp-actions.c
@@ -30,12 +30,12 @@
 #include "multipath.h"
 #include "nx-match.h"
 #include "odp-netlink.h"
-#include "ofp-parse.h"
 #include "ofp-prop.h"
 #include "ofp-util.h"
 #include "ofpbuf.h"
 #include "unaligned.h"
 #include "util.h"
+#include "openvswitch/ofp-parse.h"
 #include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(ofp_actions);

diff --git a/lib/ofp-parse.c b/lib/ofp-parse.c
@@ -16,8 +16,6 @@
 
 #include <config.h>
 
-#include "ofp-parse.h"
-
 #include <ctype.h>
 #include <errno.h>
 #include <stdlib.h>
@@ -38,6 +36,7 @@
 #include "packets.h"
 #include "simap.h"
 #include "socket-util.h"
+#include "openvswitch/ofp-parse.h"
 #include "openvswitch/vconn.h"
 
 /* Parses 'str' as an 8-bit unsigned integer into '*valuep'.

diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
@@ -50,7 +50,6 @@
 #include "ofp-util.h"
 #include "ofpbuf.h"
 #include "ofp-actions.h"
-#include "ofp-parse.h"
 #include "ofp-print.h"
 #include "ofproto-dpif-ipfix.h"
 #include "ofproto-dpif-mirror.h"
@@ -70,6 +69,7 @@
 #include "unaligned.h"
 #include "unixctl.h"
 #include "vlan-bitmap.h"
+#include "openvswitch/ofp-parse.h"
 #include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(ofproto_dpif);

diff --git a/tests/test-odp.c b/tests/test-odp.c
@@ -21,10 +21,10 @@
 #include "openvswitch/dynamic-string.h"
 #include "flow.h"
 #include "match.h"
-#include "ofp-parse.h"
 #include "ofpbuf.h"
 #include "ovstest.h"
 #include "util.h"
+#include "openvswitch/ofp-parse.h"
 #include "openvswitch/vlog.h"
 
 static int

diff --git a/utilities/ovs-dpctl.c b/utilities/ovs-dpctl.c
@@ -36,10 +36,10 @@
 #include "dpctl.h"
 #include "fatal-signal.h"
 #include "odp-util.h"
-#include "ofp-parse.h"
 #include "packets.h"
 #include "timeval.h"
 #include "util.h"
+#include "openvswitch/ofp-parse.h"
 #include "openvswitch/vlog.h"
 
 static struct dpctl_params dpctl_p;

diff --git a/utilities/ovs-ofctl.c b/utilities/ovs-ofctl.c
@@ -42,7 +42,6 @@
 #include "odp-util.h"
 #include "ofp-actions.h"
 #include "ofp-msgs.h"
-#include "ofp-parse.h"
 #include "ofp-print.h"
 #include "ofp-util.h"
 #include "ofp-version-opt.h"
@@ -61,6 +60,7 @@
 #include "unixctl.h"
 #include "util.h"
 #include "openvswitch/ofp-errors.h"
+#include "openvswitch/ofp-parse.h"
 #include "openvswitch/vconn.h"
 #include "openvswitch/vlog.h"
 #include "meta-flow.h"

diff --git a/utilities/ovs-testcontroller.c b/utilities/ovs-testcontroller.c
@@ -29,7 +29,6 @@
 #include "daemon.h"
 #include "fatal-signal.h"
 #include "learning-switch.h"
-#include "ofp-parse.h"
 #include "ofp-version-opt.h"
 #include "ofpbuf.h"
 #include "openflow/openflow.h"
@@ -40,6 +39,7 @@
 #include "timeval.h"
 #include "unixctl.h"
 #include "util.h"
+#include "openvswitch/ofp-parse.h"
 #include "openvswitch/vconn.h"
 #include "openvswitch/vlog.h"
 #include "socket-util.h"