ovsdb: Use new ovsdb_log_write_and_free().

Signed-off-by: Justin Pettit <jpettit@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>

diff --git a/ovsdb/ovsdb-tool.c b/ovsdb/ovsdb-tool.c
index 61ee6b377b6f5ed6d6a095b84d8441fa12c808b6..c2ad2310c234eb81d4a11f637fd634a5a3a98fe5 100644 (file)
--- 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);
 

diff --git a/tests/test-ovsdb.c b/tests/test-ovsdb.c
index 05e97cb5132cf383524b9897e68042f5d717d526..246a4260bcfba77bc77315af4f17ae0ebce77cac 100644 (file)
--- a/tests/test-ovsdb.c
+++ b/tests/test-ovsdb.c
@@ -378,8 +378,7 @@ do_log_io(struct ovs_cmdl_context *ctx)
             }
         } else if (!strncmp(command, "write:", 6)) {
             struct json *json = parse_json(command + 6);
-            error = ovsdb_log_write(target, json);
-            json_destroy(json);
+            error = ovsdb_log_write_and_free(target, json);
         } else if (!strcmp(command, "commit")) {
             error = ovsdb_log_commit_block(target);
         } else if (!strcmp(command, "replace_start")) {