Move lib/dynamic-string.h to include/openvswitch directory

Signed-off-by: Ben Warren <[email protected]> Signed-off-by: Ben Pfaff <[email protected]>
ViKingIX · Mar 19, 2016 · 3e8a2ad · 3e8a2ad
1 parent e03c096
commit 3e8a2ad
Show file tree

Hide file tree

Showing 109 changed files with 113 additions and 114 deletions.
diff --git a/include/openvswitch/automake.mk b/include/openvswitch/automake.mk
@@ -1,6 +1,7 @@
 openvswitchincludedir = $(includedir)/openvswitch
 openvswitchinclude_HEADERS = \
 	include/openvswitch/compiler.h \
+	include/openvswitch/dynamic-string.h \
 	include/openvswitch/geneve.h \
 	include/openvswitch/list.h \
 	include/openvswitch/ofp-errors.h \

diff --git a/lib/dynamic-string.h → include/openvswitch/dynamic-string.h b/lib/dynamic-string.h → include/openvswitch/dynamic-string.h
@@ -14,16 +14,15 @@
  * limitations under the License.
  */
 
-#ifndef DYNAMIC_STRING_H
-#define DYNAMIC_STRING_H 1
+#ifndef OPENVSWITCH_DYNAMIC_STRING_H
+#define OPENVSWITCH_DYNAMIC_STRING_H 1
 
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <time.h>
-#include "compiler.h"
+#include "openvswitch/compiler.h"
 
 /* A "dynamic string", that is, a buffer that can be used to construct a
  * string across a series of operations that extend or modify it.

diff --git a/lib/automake.mk b/lib/automake.mk
@@ -77,7 +77,6 @@ lib_libopenvswitch_la_SOURCES = \
 	lib/heap.c \
 	lib/heap.h \
 	lib/dynamic-string.c \
-	lib/dynamic-string.h \
 	lib/entropy.c \
 	lib/entropy.h \
 	lib/fat-rwlock.c \

diff --git a/lib/backtrace.h b/lib/backtrace.h
@@ -18,7 +18,7 @@
 #define BACKTRACE_H 1
 
 #include <stdint.h>
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 
 /* log_backtrace() will save the backtrace of a running program
  * into the log at the DEBUG level.

diff --git a/lib/bfd.c b/lib/bfd.c
@@ -26,7 +26,7 @@
 #include "csum.h"
 #include "dp-packet.h"
 #include "dpif.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "flow.h"
 #include "hash.h"
 #include "hmap.h"

diff --git a/lib/bundle.c b/lib/bundle.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, 2012, 2013, 2014, 2015 Nicira, Inc.
+/* Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 #include <inttypes.h>
 
 #include "colors.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "multipath.h"
 #include "meta-flow.h"
 #include "nx-match.h"

diff --git a/lib/cfm.c b/lib/cfm.c
@@ -24,7 +24,7 @@
 #include "byte-order.h"
 #include "connectivity.h"
 #include "dp-packet.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "flow.h"
 #include "hash.h"
 #include "hmap.h"

diff --git a/lib/classifier.c b/lib/classifier.c
@@ -20,7 +20,7 @@
 #include <errno.h>
 #include <netinet/in.h>
 #include "byte-order.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "odp-util.h"
 #include "ofp-util.h"
 #include "packets.h"

diff --git a/lib/command-line.c b/lib/command-line.c
@@ -19,7 +19,7 @@
 #include <getopt.h>
 #include <limits.h>
 #include <stdlib.h>
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "ovs-thread.h"
 #include "util.h"
 #include "openvswitch/vlog.h"

diff --git a/lib/coverage.c b/lib/coverage.c
@@ -18,7 +18,7 @@
 #include "coverage.h"
 #include <inttypes.h>
 #include <stdlib.h>
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "hash.h"
 #include "svec.h"
 #include "timeval.h"

diff --git a/lib/db-ctl-base.c b/lib/db-ctl-base.c
@@ -25,7 +25,7 @@
 #include "command-line.h"
 #include "compiler.h"
 #include "dirs.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "fatal-signal.h"
 #include "hash.h"
 #include "json.h"

diff --git a/lib/db-ctl-base.h b/lib/db-ctl-base.h
@@ -18,7 +18,7 @@
 #define DB_CTL_BASE_H 1
 
 #include "compiler.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "shash.h"
 
 struct ctl_context;

diff --git a/lib/dp-packet.c b/lib/dp-packet.c
@@ -17,7 +17,7 @@
 #include <config.h>
 #include <stdlib.h>
 #include <string.h>
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "netdev-dpdk.h"
 #include "dp-packet.h"
 #include "util.h"

diff --git a/lib/dpctl.c b/lib/dpctl.c
@@ -32,7 +32,7 @@
 #include "dirs.h"
 #include "dpctl.h"
 #include "dpif.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "flow.h"
 #include "match.h"
 #include "netdev.h"

diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c
@@ -39,7 +39,7 @@
 #include "dpif.h"
 #include "dpif-provider.h"
 #include "dummy.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "fat-rwlock.h"
 #include "flow.h"
 #include "hmapx.h"

diff --git a/lib/dpif-netlink.c b/lib/dpif-netlink.c
@@ -34,7 +34,7 @@
 
 #include "bitmap.h"
 #include "dpif-provider.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "flow.h"
 #include "fat-rwlock.h"
 #include "netdev.h"

diff --git a/lib/dpif.c b/lib/dpif.c
@@ -27,7 +27,7 @@
 #include "dpctl.h"
 #include "dp-packet.h"
 #include "dpif-netdev.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "flow.h"
 #include "netdev.h"
 #include "netlink.h"

diff --git a/lib/dynamic-string.c b/lib/dynamic-string.c
@@ -15,7 +15,7 @@
  */
 
 #include <config.h>
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include <inttypes.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/lib/flow.c b/lib/flow.c
@@ -29,7 +29,7 @@
 #include "colors.h"
 #include "coverage.h"
 #include "csum.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "hash.h"
 #include "jhash.h"
 #include "match.h"

diff --git a/lib/json.c b/lib/json.c
@@ -24,7 +24,7 @@
 #include <limits.h>
 #include <string.h>
 
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "hash.h"
 #include "shash.h"
 #include "unicode.h"

diff --git a/lib/jsonrpc.c b/lib/jsonrpc.c
@@ -21,7 +21,7 @@
 #include <errno.h>
 
 #include "byteq.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "fatal-signal.h"
 #include "json.h"
 #include "list.h"

diff --git a/lib/lacp.c b/lib/lacp.c
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 
 #include "connectivity.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "hash.h"
 #include "hmap.h"
 #include "dp-packet.h"

diff --git a/lib/learn.c b/lib/learn.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, 2013, 2014, 2015 Nicira, Inc.
+ * Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 
 #include "byte-order.h"
 #include "colors.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "match.h"
 #include "meta-flow.h"
 #include "nx-match.h"

diff --git a/lib/match.c b/lib/match.c
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include "byte-order.h"
 #include "colors.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "ofp-util.h"
 #include "packets.h"
 #include "tun-metadata.h"

diff --git a/lib/memory.c b/lib/memory.c
@@ -19,7 +19,7 @@
 #include <stdbool.h>
 #include <sys/time.h>
 #include <sys/resource.h>
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "poll-loop.h"
 #include "simap.h"
 #include "timeval.h"

diff --git a/lib/meta-flow.c b/lib/meta-flow.c
@@ -24,7 +24,7 @@
 #include <netinet/ip6.h>
 
 #include "classifier.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "nx-match.h"
 #include "ofp-util.h"
 #include "ovs-thread.h"

diff --git a/lib/multipath.c b/lib/multipath.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2011, 2012, 2013, 2014 Nicira, Inc.
+ * Copyright (c) 2010, 2011, 2012, 2013, 2014, 2016 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
 #include <sys/types.h>
 #include <netinet/in.h>
 #include "colors.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "nx-match.h"
 #include "ofp-actions.h"
 #include "ofp-util.h"

diff --git a/lib/netdev-bsd.c b/lib/netdev-bsd.c
@@ -50,7 +50,7 @@
 #include "coverage.h"
 #include "dp-packet.h"
 #include "dpif-netdev.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "fatal-signal.h"
 #include "openflow/openflow.h"
 #include "ovs-thread.h"

diff --git a/lib/netdev-dummy.c b/lib/netdev-dummy.c
@@ -22,7 +22,7 @@
 
 #include "dp-packet.h"
 #include "dpif-netdev.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "flow.h"
 #include "list.h"
 #include "netdev-provider.h"

diff --git a/lib/netdev-linux.c b/lib/netdev-linux.c
@@ -52,7 +52,7 @@
 #include "dp-packet.h"
 #include "dpif-netlink.h"
 #include "dpif-netdev.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "fatal-signal.h"
 #include "hash.h"
 #include "hmap.h"

diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c
@@ -32,7 +32,7 @@
 #include "dirs.h"
 #include "dpif.h"
 #include "dp-packet.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "flow.h"
 #include "hash.h"
 #include "hmap.h"

diff --git a/lib/netdev.c b/lib/netdev.c
@@ -27,7 +27,7 @@
 #include "coverage.h"
 #include "dpif.h"
 #include "dp-packet.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "fatal-signal.h"
 #include "hash.h"
 #include "list.h"

diff --git a/lib/netlink-conntrack.c b/lib/netlink-conntrack.c
@@ -27,7 +27,7 @@
 
 #include "byte-order.h"
 #include "compiler.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "netlink.h"
 #include "netlink-socket.h"
 #include "ofpbuf.h"

diff --git a/lib/netlink-conntrack.h b/lib/netlink-conntrack.h
@@ -20,7 +20,7 @@
 #include "byte-order.h"
 #include "compiler.h"
 #include "ct-dpif.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "hmap.h"
 #include "ofpbuf.h"
 #include "timeval.h"

diff --git a/lib/netlink-socket.c b/lib/netlink-socket.c
@@ -23,7 +23,7 @@
 #include <sys/uio.h>
 #include <unistd.h>
 #include "coverage.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "hash.h"
 #include "hmap.h"
 #include "netlink.h"

diff --git a/lib/nx-match.c b/lib/nx-match.c
@@ -22,7 +22,7 @@
 
 #include "classifier.h"
 #include "colors.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "hmap.h"
 #include "meta-flow.h"
 #include "ofp-actions.h"

diff --git a/lib/odp-util.c b/lib/odp-util.c
@@ -29,7 +29,7 @@
 #include "byte-order.h"
 #include "coverage.h"
 #include "dpif.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "flow.h"
 #include "netlink.h"
 #include "ofpbuf.h"

diff --git a/lib/ofp-actions.c b/lib/ofp-actions.c
@@ -23,7 +23,7 @@
 #include "colors.h"
 #include "compiler.h"
 #include "dummy.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "hmap.h"
 #include "learn.h"
 #include "meta-flow.h"

diff --git a/lib/ofp-errors.c b/lib/ofp-errors.c
@@ -17,7 +17,7 @@
 #include <config.h>
 #include <errno.h>
 #include "byte-order.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "ofp-msgs.h"
 #include "ofp-util.h"
 #include "ofpbuf.h"

diff --git a/lib/ofp-msgs.c b/lib/ofp-msgs.c
@@ -17,7 +17,7 @@
 #include <config.h>
 #include "ofp-msgs.h"
 #include "byte-order.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "hash.h"
 #include "hmap.h"
 #include "ofpbuf.h"

diff --git a/lib/ofp-parse.c b/lib/ofp-parse.c
@@ -24,7 +24,7 @@
 #include <netinet/in.h>
 
 #include "byte-order.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "learn.h"
 #include "meta-flow.h"
 #include "multipath.h"