mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-30 22:05:19 +00:00
Code Issues Releases Wiki Activity

ovsdb: Use new ovsdb_log_write_and_free().

Browse Source 
Signed-off-by: Justin Pettit <jpettit@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
This commit is contained in:
Justin Pettit
2018-05-17 10:58:47 -07:00
parent fac4786a1b
commit 1d0dead5c4
2 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ovsdb/ovsdb-tool.c
View File

@@ -226,14 +226,6 @@ print_and_free_json(struct json *json)
free(string); free(string);
} }
static struct ovsdb_error *
write_and_free_json(struct ovsdb_log *log, struct json *json)
{
struct ovsdb_error *error = ovsdb_log_write(log, json);
json_destroy(json);
return error;
}
static void static void
check_ovsdb_error(struct ovsdb_error *error) check_ovsdb_error(struct ovsdb_error *error)
{ {
@@ -270,7 +262,7 @@ do_create(struct ovs_cmdl_context *ctx)
/* Create database file. */ /* Create database file. */
check_ovsdb_error(ovsdb_log_open(db_file_name, OVSDB_MAGIC, check_ovsdb_error(ovsdb_log_open(db_file_name, OVSDB_MAGIC,
OVSDB_LOG_CREATE_EXCL, -1, &log)); OVSDB_LOG_CREATE_EXCL, -1, &log));
check_ovsdb_error(write_and_free_json(log, json)); check_ovsdb_error(ovsdb_log_write_and_free(log, json));
check_ovsdb_error(ovsdb_log_commit_block(log)); check_ovsdb_error(ovsdb_log_commit_block(log));
ovsdb_log_close(log); ovsdb_log_close(log);
} }
@@ -348,9 +340,9 @@ write_standalone_db(const char *file_name, const char *comment,
return error; return error;
} }
error = write_and_free_json(log, ovsdb_schema_to_json(db->schema)); error = ovsdb_log_write_and_free(log, ovsdb_schema_to_json(db->schema));
if (!error) { if (!error) {
error = write_and_free_json(log, ovsdb_to_txn_json(db, comment)); error = ovsdb_log_write_and_free(log, ovsdb_to_txn_json(db, comment));
} }
ovsdb_log_close(log); ovsdb_log_close(log);

3
tests/test-ovsdb.c
View File

@@ -378,8 +378,7 @@ do_log_io(struct ovs_cmdl_context *ctx)
} }
} else if (!strncmp(command, "write:", 6)) { } else if (!strncmp(command, "write:", 6)) {
struct json *json = parse_json(command + 6); struct json *json = parse_json(command + 6);
error = ovsdb_log_write(target, json); error = ovsdb_log_write_and_free(target, json);
json_destroy(json);
} else if (!strcmp(command, "commit")) { } else if (!strcmp(command, "commit")) {
error = ovsdb_log_commit_block(target); error = ovsdb_log_commit_block(target);
} else if (!strcmp(command, "replace_start")) { } else if (!strcmp(command, "replace_start")) {