Merge "master" into "next".

[sliver-openvswitch.git] / ovsdb / ovsdb-server.c

diff --git a/ovsdb/ovsdb-server.c b/ovsdb/ovsdb-server.c
index ab7e6c3..eccbf7d 100644 (file)
--- a/ovsdb/ovsdb-server.c
+++ b/ovsdb/ovsdb-server.c
@@ -124,14 +124,14 @@ static void
 query_db_remotes(const char *name_, const struct ovsdb *db,
                  struct shash *remotes)
 {
-    char *name, *db_prefix, *table_name, *column_name;
+    char *name, *table_name, *column_name;
     const struct ovsdb_column *column;
     const struct ovsdb_table *table;
     const struct ovsdb_row *row;
     char *save_ptr = NULL;
 
     name = xstrdup(name_);
-    db_prefix = strtok_r(name, ":", &save_ptr);
+    strtok_r(name, ":", &save_ptr); /* "db:" */
     table_name = strtok_r(NULL, ",", &save_ptr);
     column_name = strtok_r(NULL, ",", &save_ptr);
     if (!table_name || !column_name) {
@@ -149,8 +149,8 @@ query_db_remotes(const char *name_, const struct ovsdb *db,
                   name_, table_name, column_name);
     }
 
-    if (column->type.key_type != OVSDB_TYPE_STRING
-        || column->type.value_type != OVSDB_TYPE_VOID) {
+    if (column->type.key.type != OVSDB_TYPE_STRING
+        || column->type.value.type != OVSDB_TYPE_VOID) {
         ovs_fatal(0, "remote \"%s\": type of table \"%s\" column \"%s\" is "
                   "not string or set of strings",
                   name_, table_name, column_name);
@@ -192,7 +192,7 @@ set_remotes(struct ovsdb_jsonrpc_server *jsonrpc,
 
 
 static void
-ovsdb_server_exit(struct unixctl_conn *conn, const char *args UNUSED,
+ovsdb_server_exit(struct unixctl_conn *conn, const char *args OVS_UNUSED,
                   void *exiting_)
 {
     bool *exiting = exiting_;