projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofp-print: Print Nicira error extension messages.
[openvswitch]
/
ovsdb
/
execution.c
diff --git
a/ovsdb/execution.c
b/ovsdb/execution.c
index b984b1b528c73ea57233284913935678494b48f0..a96abfcaf959d6f463fb0f8b7348228ef34dddf1 100644
(file)
--- 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)) {
|| !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 {
if (params->type != JSON_ARRAY) {
error = ovsdb_syntax_error(params, NULL, "array expected");
} else {
@@
-137,7
+135,7
@@
ovsdb_execute(struct ovsdb *db, const struct json *params,
/* Parse and execute operation. */
ovsdb_parser_init(&parser, operation,
/* Parse and execute operation. */
ovsdb_parser_init(&parser, operation,
- "ovsdb operation %zu of %zu", i
+ 1
, n_operations);
+ "ovsdb operation %zu of %zu", i, n_operations);
op = ovsdb_parser_member(&parser, "op", OP_ID);
result = json_object_create();
if (op) {
op = ovsdb_parser_member(&parser, "op", OP_ID);
result = json_object_create();
if (op) {
@@
-629,7
+627,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++) {
/* 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);
struct ovsdb_row *row;
row = ovsdb_row_create(table);