diff options
author | Justin Pettit <jpettit@ovn.org> | 2018-05-17 10:58:47 -0700 |
---|---|---|
committer | Justin Pettit <jpettit@ovn.org> | 2018-05-17 13:01:59 -0700 |
commit | 1d0dead5c47fbd80c00f80ea2ea064ae5e4cb22a (patch) | |
tree | 17a4b6ce8b9a14032220a38537818a5b7e233638 /ovsdb | |
parent | fac4786a1b94ffc85eeb32a2b6b98f7b40740975 (diff) | |
download | openvswitch-1d0dead5c47fbd80c00f80ea2ea064ae5e4cb22a.tar.gz |
ovsdb: Use new ovsdb_log_write_and_free().
Signed-off-by: Justin Pettit <jpettit@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'ovsdb')
-rw-r--r-- | ovsdb/ovsdb-tool.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/ovsdb/ovsdb-tool.c b/ovsdb/ovsdb-tool.c index 61ee6b377..c2ad2310c 100644 --- a/ovsdb/ovsdb-tool.c +++ b/ovsdb/ovsdb-tool.c @@ -226,14 +226,6 @@ print_and_free_json(struct json *json) 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 check_ovsdb_error(struct ovsdb_error *error) { @@ -270,7 +262,7 @@ do_create(struct ovs_cmdl_context *ctx) /* Create database file. */ check_ovsdb_error(ovsdb_log_open(db_file_name, OVSDB_MAGIC, 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)); ovsdb_log_close(log); } @@ -348,9 +340,9 @@ write_standalone_db(const char *file_name, const char *comment, 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) { - 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); |