json: Move from lib to include/openvswitch.

To easily allow both in- and out-of-tree building of the Python
wrapper for the OVS JSON parser (e.g. w/ pip), move json.h to
include/openvswitch. This also requires moving lib/{hmap,shash}.h.

Both hmap.h and shash.h were #include-ing "util.h" even though the
headers themselves did not use anything from there, but rather from
include/openvswitch/util.h. Fixing that required including util.h
in several C files mostly due to OVS_NOT_REACHED and things like
xmalloc.

Signed-off-by: Terry Wilson <twilson@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>

22 files changed, 39 insertions, 28 deletions

diff --git a/ovsdb/column.c b/ovsdb/column.c
index b41df2e4c..8838df3eb 100644
--- a/ovsdb/column.c
+++ b/ovsdb/column.c
@@ -21,7 +21,7 @@
 
 #include "column.h"
 #include "openvswitch/dynamic-string.h"
-#include "json.h"
+#include "openvswitch/json.h"
 #include "ovsdb-error.h"
 #include "ovsdb-parser.h"
 #include "table.h"
diff --git a/ovsdb/condition.c b/ovsdb/condition.c
index 39a097752..6da3b08ad 100644
--- a/ovsdb/condition.c
+++ b/ovsdb/condition.c
@@ -20,10 +20,14 @@
 #include <limits.h>
 
 #include "column.h"
-#include "json.h"
+#include "openvswitch/json.h"
 #include "ovsdb-error.h"
 #include "row.h"
+
+#include <string.h>
+
 #include "table.h"
+#include "util.h"
 
 struct ovsdb_error *
 ovsdb_function_from_string(const char *name, enum ovsdb_function *function)
diff --git a/ovsdb/execution.c b/ovsdb/execution.c
index d3fc8b914..e972ce7ad 100644
--- a/ovsdb/execution.c
+++ b/ovsdb/execution.c
@@ -20,7 +20,7 @@
 #include "column.h"
 #include "condition.h"
 #include "file.h"
-#include "json.h"
+#include "openvswitch/json.h"
 #include "mutation.h"
 #include "ovsdb-data.h"
 #include "ovsdb-error.h"
diff --git a/ovsdb/file.c b/ovsdb/file.c
index 2894f30da..7f8554ada 100644
--- a/ovsdb/file.c
+++ b/ovsdb/file.c
@@ -24,7 +24,7 @@
 #include "bitmap.h"
 #include "column.h"
 #include "log.h"
-#include "json.h"
+#include "openvswitch/json.h"
 #include "lockfile.h"
 #include "ovsdb.h"
 #include "ovsdb-error.h"
diff --git a/ovsdb/jsonrpc-server.c b/ovsdb/jsonrpc-server.c
index 864fb0309..bde912227 100644
--- a/ovsdb/jsonrpc-server.c
+++ b/ovsdb/jsonrpc-server.c
@@ -23,7 +23,7 @@
 #include "column.h"
 #include "openvswitch/dynamic-string.h"
 #include "monitor.h"
-#include "json.h"
+#include "openvswitch/json.h"
 #include "jsonrpc.h"
 #include "ovsdb-error.h"
 #include "ovsdb-parser.h"
@@ -39,6 +39,7 @@
 #include "timeval.h"
 #include "transaction.h"
 #include "trigger.h"
+#include "util.h"
 #include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(ovsdb_jsonrpc_server);
diff --git a/ovsdb/log.c b/ovsdb/log.c
index 8004d3dce..380f5e93d 100644
--- a/ovsdb/log.c
+++ b/ovsdb/log.c
@@ -24,7 +24,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "json.h"
+#include "openvswitch/json.h"
 #include "lockfile.h"
 #include "ovsdb.h"
 #include "ovsdb-error.h"
diff --git a/ovsdb/monitor.c b/ovsdb/monitor.c
index 54c27c448..99083e1a2 100644
--- a/ovsdb/monitor.c
+++ b/ovsdb/monitor.c
@@ -21,7 +21,7 @@
 #include "bitmap.h"
 #include "column.h"
 #include "openvswitch/dynamic-string.h"
-#include "json.h"
+#include "openvswitch/json.h"
 #include "jsonrpc.h"
 #include "ovsdb-error.h"
 #include "ovsdb-parser.h"
@@ -36,6 +36,7 @@
 #include "transaction.h"
 #include "jsonrpc-server.h"
 #include "monitor.h"
+#include "util.h"
 #include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(ovsdb_monitor);
diff --git a/ovsdb/mutation.c b/ovsdb/mutation.c
index 6a43e3423..e5d192e15 100644
--- a/ovsdb/mutation.c
+++ b/ovsdb/mutation.c
@@ -22,9 +22,13 @@
 
 #include "column.h"
 #include "ovsdb-error.h"
-#include "json.h"
+#include "openvswitch/json.h"
 #include "row.h"
+
+#include <string.h>
+
 #include "table.h"
+#include "util.h"
 
 struct ovsdb_error *
 ovsdb_mutator_from_string(const char *name, enum ovsdb_mutator *mutator)
diff --git a/ovsdb/ovsdb-client.c b/ovsdb/ovsdb-client.c
index 4105d4741..7dcc07c94 100644
--- a/ovsdb/ovsdb-client.c
+++ b/ovsdb/ovsdb-client.c
@@ -32,7 +32,7 @@
 #include "dirs.h"
 #include "openvswitch/dynamic-string.h"
 #include "fatal-signal.h"
-#include "json.h"
+#include "openvswitch/json.h"
 #include "jsonrpc.h"
 #include "lib/table.h"
 #include "ovsdb.h"
diff --git a/ovsdb/ovsdb-server.c b/ovsdb/ovsdb-server.c
index 11801188d..239cca8ec 100644
--- a/ovsdb/ovsdb-server.c
+++ b/ovsdb/ovsdb-server.c
@@ -30,7 +30,7 @@
 #include "fatal-signal.h"
 #include "file.h"
 #include "hash.h"
-#include "json.h"
+#include "openvswitch/json.h"
 #include "jsonrpc.h"
 #include "jsonrpc-server.h"
 #include "openvswitch/list.h"
@@ -45,7 +45,7 @@
 #include "replication.h"
 #include "row.h"
 #include "simap.h"
-#include "shash.h"
+#include "openvswitch/shash.h"
 #include "stream-ssl.h"
 #include "stream.h"
 #include "sset.h"
diff --git a/ovsdb/ovsdb-tool.c b/ovsdb/ovsdb-tool.c
index 37e219ff4..af83da201 100644
--- a/ovsdb/ovsdb-tool.c
+++ b/ovsdb/ovsdb-tool.c
@@ -31,7 +31,7 @@
 #include "file.h"
 #include "lockfile.h"
 #include "log.h"
-#include "json.h"
+#include "openvswitch/json.h"
 #include "ovsdb.h"
 #include "ovsdb-data.h"
 #include "ovsdb-error.h"
diff --git a/ovsdb/ovsdb.c b/ovsdb/ovsdb.c
index b7cc655da..03919004d 100644
--- a/ovsdb/ovsdb.c
+++ b/ovsdb/ovsdb.c
@@ -18,7 +18,7 @@
 #include "ovsdb.h"
 
 #include "column.h"
-#include "json.h"
+#include "openvswitch/json.h"
 #include "ovsdb-error.h"
 #include "ovsdb-parser.h"
 #include "ovsdb-types.h"
diff --git a/ovsdb/ovsdb.h b/ovsdb/ovsdb.h
index b3eaf15f0..418805c15 100644
--- a/ovsdb/ovsdb.h
+++ b/ovsdb/ovsdb.h
@@ -17,9 +17,9 @@
 #define OVSDB_OVSDB_H 1
 
 #include "compiler.h"
-#include "hmap.h"
+#include "openvswitch/hmap.h"
 #include "openvswitch/list.h"
-#include "shash.h"
+#include "openvswitch/shash.h"
 
 struct json;
 struct ovsdb_log;
diff --git a/ovsdb/replication.c b/ovsdb/replication.c
index 736771461..52b708523 100644
--- a/ovsdb/replication.c
+++ b/ovsdb/replication.c
@@ -20,7 +20,7 @@
 #include "replication.h"
 
 #include "condition.h"
-#include "json.h"
+#include "openvswitch/json.h"
 #include "jsonrpc.h"
 #include "ovsdb.h"
 #include "ovsdb-error.h"
diff --git a/ovsdb/replication.h b/ovsdb/replication.h
index 012ca0960..93ac22b22 100644
--- a/ovsdb/replication.h
+++ b/ovsdb/replication.h
@@ -18,7 +18,7 @@
 #ifndef REPLICATION_H
 #define REPLICATION_H 1
 
-#include "shash.h"
+#include "openvswitch/shash.h"
 
 struct db {
     /* Initialized in main(). */
diff --git a/ovsdb/row.c b/ovsdb/row.c
index 572c10321..9c312947e 100644
--- a/ovsdb/row.c
+++ b/ovsdb/row.c
@@ -20,11 +20,12 @@
 #include <stddef.h>
 
 #include "openvswitch/dynamic-string.h"
-#include "json.h"
+#include "openvswitch/json.h"
 #include "ovsdb-error.h"
-#include "shash.h"
+#include "openvswitch/shash.h"
 #include "sort.h"
 #include "table.h"
+#include "util.h"
 
 static struct ovsdb_row *
 allocate_row(const struct ovsdb_table *table)
diff --git a/ovsdb/row.h b/ovsdb/row.h
index b1d1edd47..83024bc0f 100644
--- a/ovsdb/row.h
+++ b/ovsdb/row.h
@@ -19,7 +19,7 @@
 #include <stddef.h>
 #include <stdint.h>
 #include "column.h"
-#include "hmap.h"
+#include "openvswitch/hmap.h"
 #include "openvswitch/list.h"
 #include "ovsdb-data.h"
 
diff --git a/ovsdb/server.h b/ovsdb/server.h
index 667fce992..c0bbb69ce 100644
--- a/ovsdb/server.h
+++ b/ovsdb/server.h
@@ -16,9 +16,9 @@
 #ifndef SERVER_H
 #define SERVER_H 1
 
-#include "hmap.h"
+#include "openvswitch/hmap.h"
 #include "openvswitch/list.h"
-#include "shash.h"
+#include "openvswitch/shash.h"
 
 struct ovsdb;
 struct ovsdb_server;
diff --git a/ovsdb/table.c b/ovsdb/table.c
index e7545ad31..7ec55d61f 100644
--- a/ovsdb/table.c
+++ b/ovsdb/table.c
@@ -19,7 +19,7 @@
 
 #include <limits.h>
 
-#include "json.h"
+#include "openvswitch/json.h"
 #include "column.h"
 #include "ovsdb-error.h"
 #include "ovsdb-parser.h"
diff --git a/ovsdb/table.h b/ovsdb/table.h
index 68a59add4..f910d1880 100644
--- a/ovsdb/table.h
+++ b/ovsdb/table.h
@@ -18,8 +18,8 @@
 
 #include <stdbool.h>
 #include "compiler.h"
-#include "hmap.h"
-#include "shash.h"
+#include "openvswitch/hmap.h"
+#include "openvswitch/shash.h"
 
 struct json;
 struct uuid;
diff --git a/ovsdb/transaction.c b/ovsdb/transaction.c
index 9e12a6225..865e9b6b2 100644
--- a/ovsdb/transaction.c
+++ b/ovsdb/transaction.c
@@ -20,8 +20,8 @@
 #include "bitmap.h"
 #include "openvswitch/dynamic-string.h"
 #include "hash.h"
-#include "hmap.h"
-#include "json.h"
+#include "openvswitch/hmap.h"
+#include "openvswitch/json.h"
 #include "openvswitch/list.h"
 #include "ovsdb-error.h"
 #include "ovsdb.h"
diff --git a/ovsdb/trigger.c b/ovsdb/trigger.c
index 3392fb72f..0fbe94908 100644
--- a/ovsdb/trigger.c
+++ b/ovsdb/trigger.c
@@ -19,7 +19,7 @@
 
 #include <limits.h>
 
-#include "json.h"
+#include "openvswitch/json.h"
 #include "jsonrpc.h"
 #include "ovsdb.h"
 #include "poll-loop.h"