X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=ovsdb%2Fexecution.c;h=e2f10cbb268187e3c93f862d7ee3c7e1547e20a8;hb=0574f71b4b6820cecb8247a6e0269606c8ef2edf;hp=5b6762f0753ff7b9f0e451ba9626352134f61674;hpb=0cd85e1b0b35eaebe458f1d40c0df8c35d9d7e21;p=openvswitch diff --git a/ovsdb/execution.c b/ovsdb/execution.c index 5b6762f0..e2f10cbb 100644 --- a/ovsdb/execution.c +++ b/ovsdb/execution.c @@ -103,8 +103,6 @@ ovsdb_execute(struct ovsdb *db, const struct json *params, || !params->u.array.n || params->u.array.elems[0]->type != JSON_STRING || strcmp(params->u.array.elems[0]->u.string, db->schema->name)) { - struct ovsdb_error *error; - if (params->type != JSON_ARRAY) { error = ovsdb_syntax_error(params, NULL, "array expected"); } else { @@ -294,6 +292,7 @@ ovsdb_execute_insert(struct ovsdb_execution *x, struct ovsdb_parser *parser, symbol = ovsdb_symbol_table_insert(x->symtab, json_string(uuid_name)); if (symbol->used) { + ovsdb_error_destroy(error); return ovsdb_syntax_error(uuid_name, "duplicate uuid-name", "This \"uuid-name\" appeared on an " "earlier \"insert\" operation."); @@ -629,7 +628,6 @@ ovsdb_execute_wait(struct ovsdb_execution *x, struct ovsdb_parser *parser, /* Parse "rows" into 'expected'. */ ovsdb_row_hash_init(&expected, &columns); for (i = 0; i < rows->u.array.n; i++) { - struct ovsdb_error *error; struct ovsdb_row *row; row = ovsdb_row_create(table);