@@ -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 \
new file mode 100644
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 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.
+ * You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#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 "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.
+ *
+ * The 'string' member does not always point to a null-terminated string.
+ * Initially it is NULL, and even when it is nonnull, some operations do not
+ * ensure that it is null-terminated. Use ds_cstr() to ensure that memory is
+ * allocated for the string and that it is null-terminated. */
+struct ds {
+ char *string; /* Null-terminated string. */
+ size_t length; /* Bytes used, not including null terminator. */
+ size_t allocated; /* Bytes allocated, not including null terminator. */
+};
+
+#define DS_EMPTY_INITIALIZER { NULL, 0, 0 }
+
+void ds_init(struct ds *);
+void ds_clear(struct ds *);
+void ds_truncate(struct ds *, size_t new_length);
+void ds_reserve(struct ds *, size_t min_length);
+char *ds_put_uninit(struct ds *, size_t n);
+static inline void ds_put_char(struct ds *, char);
+void ds_put_utf8(struct ds *, int uc);
+void ds_put_char_multiple(struct ds *, char, size_t n);
+void ds_put_buffer(struct ds *, const char *, size_t n);
+void ds_put_cstr(struct ds *, const char *);
+void ds_put_and_free_cstr(struct ds *, char *);
+void ds_put_format(struct ds *, const char *, ...) OVS_PRINTF_FORMAT(2, 3);
+void ds_put_format_valist(struct ds *, const char *, va_list)
+ OVS_PRINTF_FORMAT(2, 0);
+void ds_put_printable(struct ds *, const char *, size_t);
+void ds_put_hex(struct ds *ds, const void *buf, size_t size);
+void ds_put_hex_dump(struct ds *ds, const void *buf_, size_t size,
+ uintptr_t ofs, bool ascii);
+int ds_get_line(struct ds *, FILE *);
+int ds_get_preprocessed_line(struct ds *, FILE *, int *line_number);
+int ds_get_test_line(struct ds *, FILE *);
+
+void ds_put_strftime_msec(struct ds *, const char *format, long long int when,
+ bool utc);
+char *xastrftime_msec(const char *format, long long int when, bool utc);
+
+char *ds_cstr(struct ds *);
+const char *ds_cstr_ro(const struct ds *);
+char *ds_steal_cstr(struct ds *);
+void ds_destroy(struct ds *);
+void ds_swap(struct ds *, struct ds *);
+
+int ds_last(const struct ds *);
+bool ds_chomp(struct ds *, int c);
+
+/* Inline functions. */
+
+void ds_put_char__(struct ds *, char);
+
+static inline void
+ds_put_char(struct ds *ds, char c)
+{
+ if (ds->length < ds->allocated) {
+ ds->string[ds->length++] = c;
+ ds->string[ds->length] = '\0';
+ } else {
+ ds_put_char__(ds, c);
+ }
+}
+
+#endif /* dynamic-string.h */
@@ -75,7 +75,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 \
@@ -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.
@@ -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"
@@ -20,7 +20,7 @@
#include <arpa/inet.h>
#include <inttypes.h>
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "multipath.h"
#include "meta-flow.h"
#include "nx-match.h"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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;
@@ -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"
@@ -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"
@@ -38,7 +38,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 "cmap.h"
@@ -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"
@@ -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"
@@ -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>
deleted file mode 100644
@@ -1,93 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 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.
- * You may obtain a copy of the License at:
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef DYNAMIC_STRING_H
-#define 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"
-
-/* 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.
- *
- * The 'string' member does not always point to a null-terminated string.
- * Initially it is NULL, and even when it is nonnull, some operations do not
- * ensure that it is null-terminated. Use ds_cstr() to ensure that memory is
- * allocated for the string and that it is null-terminated. */
-struct ds {
- char *string; /* Null-terminated string. */
- size_t length; /* Bytes used, not including null terminator. */
- size_t allocated; /* Bytes allocated, not including null terminator. */
-};
-
-#define DS_EMPTY_INITIALIZER { NULL, 0, 0 }
-
-void ds_init(struct ds *);
-void ds_clear(struct ds *);
-void ds_truncate(struct ds *, size_t new_length);
-void ds_reserve(struct ds *, size_t min_length);
-char *ds_put_uninit(struct ds *, size_t n);
-static inline void ds_put_char(struct ds *, char);
-void ds_put_utf8(struct ds *, int uc);
-void ds_put_char_multiple(struct ds *, char, size_t n);
-void ds_put_buffer(struct ds *, const char *, size_t n);
-void ds_put_cstr(struct ds *, const char *);
-void ds_put_and_free_cstr(struct ds *, char *);
-void ds_put_format(struct ds *, const char *, ...) OVS_PRINTF_FORMAT(2, 3);
-void ds_put_format_valist(struct ds *, const char *, va_list)
- OVS_PRINTF_FORMAT(2, 0);
-void ds_put_printable(struct ds *, const char *, size_t);
-void ds_put_hex(struct ds *ds, const void *buf, size_t size);
-void ds_put_hex_dump(struct ds *ds, const void *buf_, size_t size,
- uintptr_t ofs, bool ascii);
-int ds_get_line(struct ds *, FILE *);
-int ds_get_preprocessed_line(struct ds *, FILE *, int *line_number);
-int ds_get_test_line(struct ds *, FILE *);
-
-void ds_put_strftime_msec(struct ds *, const char *format, long long int when,
- bool utc);
-char *xastrftime_msec(const char *format, long long int when, bool utc);
-
-char *ds_cstr(struct ds *);
-const char *ds_cstr_ro(const struct ds *);
-char *ds_steal_cstr(struct ds *);
-void ds_destroy(struct ds *);
-void ds_swap(struct ds *, struct ds *);
-
-int ds_last(const struct ds *);
-bool ds_chomp(struct ds *, int c);
-
-/* Inline functions. */
-
-void ds_put_char__(struct ds *, char);
-
-static inline void
-ds_put_char(struct ds *ds, char c)
-{
- if (ds->length < ds->allocated) {
- ds->string[ds->length++] = c;
- ds->string[ds->length] = '\0';
- } else {
- ds_put_char__(ds, c);
- }
-}
-
-#endif /* dynamic-string.h */
@@ -28,7 +28,7 @@
#include "byte-order.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"
@@ -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"
@@ -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 "openvswitch/list.h"
@@ -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"
@@ -19,7 +19,7 @@
#include "learn.h"
#include "byte-order.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "match.h"
#include "meta-flow.h"
#include "nx-match.h"
@@ -18,7 +18,7 @@
#include "match.h"
#include <stdlib.h>
#include "byte-order.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "ofp-util.h"
#include "packets.h"
#include "tun-metadata.h"
@@ -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"
@@ -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"
@@ -21,7 +21,7 @@
#include <inttypes.h>
#include <sys/types.h>
#include <netinet/in.h>
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "nx-match.h"
#include "ofp-actions.h"
#include "ofp-util.h"
@@ -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"
@@ -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 "openvswitch/list.h"
#include "netdev-provider.h"
@@ -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"
@@ -31,7 +31,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"
@@ -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 "openvswitch/list.h"
@@ -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"
@@ -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"
@@ -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"
@@ -21,7 +21,7 @@
#include <netinet/icmp6.h>
#include "classifier.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "hmap.h"
#include "meta-flow.h"
#include "ofp-actions.h"
@@ -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"
@@ -22,7 +22,7 @@
#include "byte-order.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"
@@ -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"
@@ -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"
@@ -22,7 +22,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"
@@ -29,7 +29,7 @@
#include "bundle.h"
#include "byte-order.h"
#include "compiler.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "flow.h"
#include "learn.h"
#include "multipath.h"
@@ -26,7 +26,7 @@
#include "bundle.h"
#include "byte-order.h"
#include "classifier.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "learn.h"
#include "meta-flow.h"
#include "multipath.h"
@@ -1,5 +1,5 @@
#include <config.h>
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "ofp-util.h"
#include "ofp-version-opt.h"
#include "ovs-thread.h"
@@ -18,7 +18,7 @@
#include "ofpbuf.h"
#include <stdlib.h>
#include <string.h>
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "netdev-dpdk.h"
#include "util.h"
@@ -34,7 +34,7 @@
#include <stdbool.h>
#include <stdlib.h>
#include <sys/types.h>
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "flow.h"
#include "openvswitch/list.h"
#include "lldp/lldpd.h"
@@ -33,7 +33,7 @@
#include "command-line.h"
#include "compiler.h"
#include "dpif.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "netdev.h"
#include "packets.h"
#include "seq.h"
@@ -22,7 +22,7 @@
#include <inttypes.h>
#include <limits.h>
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "hash.h"
#include "ovs-thread.h"
#include "ovsdb-error.h"
@@ -20,7 +20,7 @@
#include <inttypes.h>
#include "backtrace.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "json.h"
#include "util.h"
#include "openvswitch/vlog.h"
@@ -24,7 +24,7 @@
#include "bitmap.h"
#include "coverage.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "fatal-signal.h"
#include "json.h"
#include "jsonrpc.h"
@@ -20,7 +20,7 @@
#include <float.h>
#include <limits.h>
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "json.h"
#include "ovs-thread.h"
#include "ovsdb-data.h"
@@ -27,7 +27,7 @@
#include "crc32c.h"
#include "flow.h"
#include "hmap.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "ovs-thread.h"
#include "odp-util.h"
#include "dp-packet.h"
@@ -26,7 +26,7 @@
#include <sys/ioctl.h>
#include <linux/perf_event.h>
#include <asm/unistd.h>
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "perf-counter.h"
#include "shash.h"
#include "util.h"
@@ -22,7 +22,7 @@
#include <stdlib.h>
#include <string.h>
#include "coverage.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "fatal-signal.h"
#include "openvswitch/list.h"
#include "ovs-thread.h"
@@ -26,7 +26,7 @@
#include <sys/wait.h>
#include <unistd.h>
#include "coverage.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "fatal-signal.h"
#include "openvswitch/list.h"
#include "ovs-thread.h"
@@ -32,7 +32,7 @@
#include <sys/uio.h>
#include <sys/un.h>
#include <unistd.h>
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "ovs-thread.h"
#include "packets.h"
#include "poll-loop.h"
@@ -33,7 +33,7 @@
#include <sys/stat.h>
#include <unistd.h>
#include "coverage.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "entropy.h"
#include "ofpbuf.h"
#include "openflow/openflow.h"
@@ -25,7 +25,7 @@
#include <string.h>
#include <sys/socket.h>
#include <unistd.h>
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "packets.h"
#include "socket-util.h"
#include "util.h"
@@ -23,7 +23,7 @@
#include <stdlib.h>
#include <string.h>
#include "coverage.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "fatal-signal.h"
#include "flow.h"
#include "jsonrpc.h"
@@ -19,7 +19,7 @@
#include <ctype.h>
#include <stdlib.h>
#include <string.h>
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "util.h"
#include "openvswitch/vlog.h"
@@ -21,7 +21,7 @@
#include <unistd.h>
#include "compiler.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "socket-util.h"
#include "syslog-provider.h"
#include "util.h"
@@ -22,7 +22,7 @@
#include <unistd.h>
#include "compiler.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "socket-util.h"
#include "syslog-provider.h"
#include "util.h"
@@ -18,7 +18,7 @@
#include "table.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "json.h"
#include "ovsdb-data.h"
#include "ovsdb-error.h"
@@ -27,7 +27,7 @@
#include <unistd.h>
#include "coverage.h"
#include "dummy.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "fatal-signal.h"
#include "hash.h"
#include "hmap.h"
@@ -28,7 +28,7 @@
#include "cmap.h"
#include "coverage.h"
#include "dpif-netdev.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "errno.h"
#include "flow.h"
#include "netdev.h"
@@ -23,7 +23,7 @@
#include <string.h>
#include "classifier.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "hash.h"
#include "openvswitch/list.h"
#include "netdev.h"
@@ -19,7 +19,7 @@
#include <stdint.h>
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "netlink.h"
#include "ofpbuf.h"
#include "openflow/openflow.h"
@@ -20,7 +20,7 @@
#include <inttypes.h>
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "util.h"
/* Returns the unicode code point corresponding to leading surrogate 'leading'
@@ -20,7 +20,7 @@
#include <unistd.h>
#include "coverage.h"
#include "dirs.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "json.h"
#include "jsonrpc.h"
#include "openvswitch/list.h"
@@ -23,7 +23,7 @@
#include <stdlib.h>
#include <string.h>
#include "coverage.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "fatal-signal.h"
#include "flow.h"
#include "ofp-msgs.h"
@@ -31,7 +31,7 @@
#include "async-append.h"
#include "coverage.h"
#include "dirs.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "ofpbuf.h"
#include "ovs-thread.h"
#include "sat-math.h"
@@ -31,7 +31,7 @@
#include "ofproto/ofproto-dpif-rid.h"
#include "connectivity.h"
#include "coverage.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "flow.h"
#include "hmap.h"
#include "lacp.h"
@@ -22,7 +22,7 @@
#include <stdlib.h>
#include "coverage.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "fail-open.h"
#include "in-band.h"
#include "odp-util.h"
@@ -23,7 +23,7 @@
#include "coverage.h"
#include "cmap.h"
#include "dpif.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "fail-open.h"
#include "guarded-list.h"
#include "latch.h"
@@ -33,7 +33,7 @@
#include "coverage.h"
#include "dp-packet.h"
#include "dpif.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "in-band.h"
#include "lacp.h"
#include "learn.h"
@@ -31,7 +31,7 @@
#include "cfm.h"
#include "ovs-lldp.h"
#include "dpif.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "fail-open.h"
#include "guarded-list.h"
#include "hmapx.h"
@@ -28,7 +28,7 @@
#include "connectivity.h"
#include "connmgr.h"
#include "coverage.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "hash.h"
#include "hmap.h"
#include "meta-flow.h"
@@ -21,7 +21,7 @@
#include "connectivity.h"
#include "csum.h"
#include "dpif.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "fat-rwlock.h"
#include "hash.h"
#include "hmap.h"
@@ -25,7 +25,7 @@
#include "compiler.h"
#include "daemon.h"
#include "dirs.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "fatal-signal.h"
#include "poll-loop.h"
#include "stream.h"
@@ -16,8 +16,8 @@
#include <config.h>
#include "chassis.h"
-#include "lib/dynamic-string.h"
#include "lib/vswitch-idl.h"
+#include "openvswitch/dynamic-string.h"
#include "openvswitch/vlog.h"
#include "ovn/lib/ovn-sb-idl.h"
#include "ovn-controller.h"
@@ -15,7 +15,7 @@
#include <config.h>
#include "lflow.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "ofctrl.h"
#include "ofp-actions.h"
#include "ofpbuf.h"
@@ -16,7 +16,7 @@
#include <config.h>
#include "ofctrl.h"
#include "dirs.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "hmap.h"
#include "match.h"
#include "ofp-actions.h"
@@ -27,7 +27,7 @@
#include "compiler.h"
#include "daemon.h"
#include "dirs.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "openvswitch/vconn.h"
#include "openvswitch/vlog.h"
#include "ovn/lib/ovn-sb-idl.h"
@@ -19,7 +19,7 @@
#include <stdarg.h>
#include <stdbool.h>
#include "compiler.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "expr.h"
#include "lex.h"
#include "logical-fields.h"
@@ -16,7 +16,7 @@
#include <config.h>
#include "expr.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "json.h"
#include "lex.h"
#include "logical-fields.h"
@@ -19,7 +19,7 @@
#include <ctype.h>
#include <errno.h>
#include <stdarg.h>
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "json.h"
#include "packets.h"
#include "util.h"
@@ -21,7 +21,7 @@
#include "command-line.h"
#include "daemon.h"
#include "dirs.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "fatal-signal.h"
#include "hash.h"
#include "hmap.h"
@@ -31,7 +31,7 @@
#include "command-line.h"
#include "compiler.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "fatal-signal.h"
#include "json.h"
#include "ovsdb-data.h"
@@ -20,7 +20,7 @@
#include <stdlib.h>
#include "column.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "json.h"
#include "ovsdb-error.h"
#include "ovsdb-parser.h"
@@ -21,7 +21,7 @@
#include "bitmap.h"
#include "column.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "monitor.h"
#include "json.h"
#include "jsonrpc.h"
@@ -20,7 +20,7 @@
#include "bitmap.h"
#include "column.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "json.h"
#include "jsonrpc.h"
#include "ovsdb-error.h"
@@ -30,7 +30,7 @@
#include "compiler.h"
#include "daemon.h"
#include "dirs.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "fatal-signal.h"
#include "json.h"
#include "jsonrpc.h"
@@ -26,7 +26,7 @@
#include "command-line.h"
#include "daemon.h"
#include "dirs.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "fatal-signal.h"
#include "file.h"
#include "hash.h"
@@ -26,7 +26,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 "file.h"
#include "lockfile.h"
@@ -19,7 +19,7 @@
#include <stddef.h>
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "json.h"
#include "ovsdb-error.h"
#include "shash.h"
@@ -18,7 +18,7 @@
#include "transaction.h"
#include "bitmap.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "hash.h"
#include "hmap.h"
#include "json.h"
@@ -22,7 +22,7 @@
#include <limits.h>
#include <stdlib.h>
#include "command-line.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "ovstest.h"
#include "util.h"
@@ -24,7 +24,7 @@
#include <unistd.h>
#include "command-line.h"
#include "daemon.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "ofpbuf.h"
#include "ovstest.h"
#include "packets.h"
@@ -18,7 +18,7 @@
#undef NDEBUG
#include "odp-util.h"
#include <stdio.h>
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "flow.h"
#include "match.h"
#include "ofpbuf.h"
@@ -19,7 +19,7 @@
#include <errno.h>
#include <getopt.h>
#include <sys/wait.h>
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "fatal-signal.h"
#include "match.h"
#include "ofp-actions.h"
@@ -24,7 +24,7 @@
#include <stdlib.h>
#include "command-line.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "json.h"
#include "jsonrpc.h"
#include "ovsdb-data.h"
@@ -27,7 +27,7 @@
#include <setjmp.h>
#include "command-line.h"
#include "daemon.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "ofpbuf.h"
#include "ovstest.h"
#include "packets.h"
@@ -25,7 +25,7 @@
#include "command-line.h"
#include "daemon.h"
#include "dirs.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "jsonrpc.h"
#include "process.h"
#include "timeval.h"
@@ -35,7 +35,7 @@
#include "daemon.h"
#include "compiler.h"
#include "dirs.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "fatal-signal.h"
#include "nx-match.h"
#include "odp-util.h"
@@ -31,7 +31,7 @@
#include "command-line.h"
#include "compiler.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "fatal-signal.h"
#include "hash.h"
#include "json.h"
@@ -28,7 +28,7 @@
#include "daemon.h"
#include "dirs.h"
#include "dpif.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "hash.h"
#include "hmap.h"
#include "hmapx.h"
@@ -33,7 +33,7 @@
#include "daemon.h"
#include "dirs.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "json.h"
#include "latch.h"
#include "ofpbuf.h"
@@ -21,7 +21,7 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "process.h"
#include "util.h"
#include "openvswitch/vlog.h"
@@ -31,7 +31,7 @@
#include "command-line.h"
#include "compiler.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "fatal-signal.h"
#include "hash.h"
#include "json.h"