X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=ovsdb%2Ffile.c;h=9f0ab28043ac11148539ee9d33475e793c41a2d4;hb=5f8e32136eacbc91b7422b17d8208a64cfb3b8b9;hp=a02b6510e5f2f3c826c9a6858ed9ad8dc788a1e8;hpb=e1ebc8cea2991e19456cb9fce54ac8167f6dbf4c;p=openvswitch

diff --git a/ovsdb/file.c b/ovsdb/file.c
index a02b6510..9f0ab280 100644
--- a/ovsdb/file.c
+++ b/ovsdb/file.c
@@ -148,7 +148,6 @@ ovsdb_file_open_log(const char *file_name, enum ovsdb_log_open_mode open_mode,
     if (schemap) {
         error = ovsdb_schema_from_json(json, &schema);
         if (error) {
-            json_destroy(json);
             error = ovsdb_wrap_error(error,
                                      "failed to parse \"%s\" as ovsdb schema",
                                      file_name);
@@ -224,7 +223,7 @@ ovsdb_file_open__(const char *file_name,
             oldest_commit = date;
         }
 
-        ovsdb_txn_commit(txn, false);
+        ovsdb_error_destroy(ovsdb_txn_commit(txn, false));
     }
     if (error) {
         /* Log error but otherwise ignore it.  Probably the database just got
@@ -405,9 +404,7 @@ ovsdb_file_txn_from_json(struct ovsdb *db, const struct json *json,
         if (!table) {
             if (!strcmp(table_name, "_date")
                 && node_json->type == JSON_INTEGER) {
-                if (date) {
-                    *date = json_integer(node_json);
-                }
+                *date = json_integer(node_json);
                 continue;
             } else if (!strcmp(table_name, "_comment") || converting) {
                 continue;