ovsdb: Warn when result of ovsdb_txn_commit() is ignored and fix caller.

[openvswitch] / ovsdb / file.c

diff --git a/ovsdb/file.c b/ovsdb/file.c
index 7061d682055e71afe9a364393829f3ddb1359a70..9f0ab28043ac11148539ee9d33475e793c41a2d4 100644 (file)
--- a/ovsdb/file.c
+++ b/ovsdb/file.c
@@ -223,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
@@ -404,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;