Found by inspection.
Signed-off-by: Alin Gabriel Serdean <aserd...@cloudbasesolutions.com>
---
ovsdb/monitor.c | 50 +++++++++++++++++++++++++-------------------------
1 file changed, 25 insertions(+), 25 deletions(-)
diff --git a/ovsdb/monitor.c b/ovsdb/monitor.c
index 5e3c847..a590943 100644
--- a/ovsdb/monitor.c
+++ b/ovsdb/monitor.c
@@ -723,7 +723,7 @@ ovsdb_monitor_table_condition_updated(struct
ovsdb_monitor_table *mt,
if (ovsdb_condition_cmp_3way(&mtc->old_condition,
&mtc->new_condition)) {
if (ovsdb_condition_is_true(&mtc->new_condition)) {
- if
(!ovsdb_condition_is_true(&mtc->old_condition)) {
+ if (!ovsdb_condition_is_true(&mtc->old_condition)) {
condition->n_true_cnd++;
}
} else {
@@ -1042,17 +1042,17 @@ ovsdb_monitor_compose_update(
continue;
}
- HMAP_FOR_EACH_SAFE (row, next, hmap_node, &changes->rows) {
- struct json *row_json;
- row_json = (*row_update)(mt, condition,
OVSDB_MONITOR_ROW, row,
-
initial, changed);
- if (row_json) {
- ovsdb_monitor_add_json_row(&json,
mt->table->schema->name,
-
&table_json, row_json,
-
&row->uuid);
- }
- }
- }
+ HMAP_FOR_EACH_SAFE (row, next, hmap_node, &changes->rows) {
+ struct json *row_json;
+ row_json = (*row_update)(mt, condition, OVSDB_MONITOR_ROW, row,
+ initial, changed);
+ if (row_json) {
+ ovsdb_monitor_add_json_row(&json, mt->table->schema->name,
+ &table_json, row_json,
+ &row->uuid);
+ }
+ }
+ }
free(changed);
return json;
@@ -1145,21 +1145,21 @@ ovsdb_monitor_get_update(
} else {
ovs_assert(version == OVSDB_MONITOR_V2);
if (!cond_updated) {
- json = ovsdb_monitor_compose_update(dbmon,
initial, unflushed,
-
condition,
-
ovsdb_monitor_compose_row_update2);
-
- if (!condition || !condition->conditional) {
- ovsdb_monitor_json_cache_insert(dbmon,
version, unflushed,
-
json);
- }
- } else {
+ json = ovsdb_monitor_compose_update(dbmon, initial, unflushed,
+ condition,
+ ovsdb_monitor_compose_row_update2);
+
+ if (!condition || !condition->conditional) {
+ ovsdb_monitor_json_cache_insert(dbmon, version, unflushed,
+ json);
+ }
+ } else {
/* Compose update on whole db due to condition update.
Session must be flushed (change list is empty)*/
- json =
-
ovsdb_monitor_compose_cond_change_update(dbmon, condition);
- }
- }
+ json =
+ ovsdb_monitor_compose_cond_change_update(dbmon, condition);
+ }
+ }
}
/* Maintain transaction id of 'changes'. */
--
2.9.2.windows.1
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
