summaryrefslogtreecommitdiff
path: root/ovsdb/ovsdb.c
diff options
context:
space:
mode:
Diffstat (limited to 'ovsdb/ovsdb.c')
-rw-r--r--ovsdb/ovsdb.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/ovsdb/ovsdb.c b/ovsdb/ovsdb.c
index b5f6edb12..5bbaddbd3 100644
--- a/ovsdb/ovsdb.c
+++ b/ovsdb/ovsdb.c
@@ -26,13 +26,12 @@
#include "transaction.h"
struct ovsdb_schema *
-ovsdb_schema_create(const char *name, const char *comment)
+ovsdb_schema_create(const char *name)
{
struct ovsdb_schema *schema;
schema = xzalloc(sizeof *schema);
schema->name = xstrdup(name);
- schema->comment = comment ? xstrdup(comment) : NULL;
shash_init(&schema->tables);
return schema;
@@ -44,7 +43,7 @@ ovsdb_schema_clone(const struct ovsdb_schema *old)
struct ovsdb_schema *new;
struct shash_node *node;
- new = ovsdb_schema_create(old->name, old->comment);
+ new = ovsdb_schema_create(old->name);
SHASH_FOR_EACH (node, &old->tables) {
const struct ovsdb_table_schema *ts = node->data;
@@ -63,7 +62,6 @@ ovsdb_schema_destroy(struct ovsdb_schema *schema)
ovsdb_table_schema_destroy(node->data);
}
shash_destroy(&schema->tables);
- free(schema->comment);
free(schema->name);
free(schema);
}
@@ -118,7 +116,7 @@ struct ovsdb_error *
ovsdb_schema_from_json(struct json *json, struct ovsdb_schema **schemap)
{
struct ovsdb_schema *schema;
- const struct json *name, *comment, *tables;
+ const struct json *name, *tables;
struct ovsdb_error *error;
struct shash_node *node;
struct ovsdb_parser parser;
@@ -127,15 +125,13 @@ ovsdb_schema_from_json(struct json *json, struct ovsdb_schema **schemap)
ovsdb_parser_init(&parser, json, "database schema");
name = ovsdb_parser_member(&parser, "name", OP_ID);
- comment = ovsdb_parser_member(&parser, "comment", OP_STRING | OP_OPTIONAL);
tables = ovsdb_parser_member(&parser, "tables", OP_OBJECT);
error = ovsdb_parser_finish(&parser);
if (error) {
return error;
}
- schema = ovsdb_schema_create(json_string(name),
- comment ? json_string(comment) : NULL);
+ schema = ovsdb_schema_create(json_string(name));
SHASH_FOR_EACH (node, json_object(tables)) {
struct ovsdb_table_schema *table;
@@ -190,9 +186,6 @@ ovsdb_schema_to_json(const struct ovsdb_schema *schema)
json = json_object_create();
json_object_put_string(json, "name", schema->name);
- if (schema->comment) {
- json_object_put_string(json, "comment", schema->comment);
- }
tables = json_object_create();