projects
/
cascardo
/
ovs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace most uses of assert by ovs_assert.
[cascardo/ovs.git]
/
ovsdb
/
transaction.c
diff --git
a/ovsdb/transaction.c
b/ovsdb/transaction.c
index
cc890ad
..
646163a
100644
(file)
--- a/
ovsdb/transaction.c
+++ b/
ovsdb/transaction.c
@@
-17,8
+17,6
@@
#include "transaction.h"
#include "transaction.h"
-#include <assert.h>
-
#include "bitmap.h"
#include "dynamic-string.h"
#include "hash.h"
#include "bitmap.h"
#include "dynamic-string.h"
#include "hash.h"
@@
-111,7
+109,7
@@
ovsdb_txn_create(struct ovsdb *db)
static void
ovsdb_txn_free(struct ovsdb_txn *txn)
{
static void
ovsdb_txn_free(struct ovsdb_txn *txn)
{
- assert(list_is_empty(&txn->txn_tables));
+
ovs_
assert(list_is_empty(&txn->txn_tables));
ds_destroy(&txn->comment);
free(txn);
}
ds_destroy(&txn->comment);
free(txn);
}
@@
-807,7
+805,7
@@
ovsdb_txn_commit(struct ovsdb_txn *txn, bool durable)
if (error) {
/* We don't support two-phase commit so only the first replica is
* allowed to report an error. */
if (error) {
/* We don't support two-phase commit so only the first replica is
* allowed to report an error. */
- assert(&replica->node == txn->db->replicas.next);
+
ovs_
assert(&replica->node == txn->db->replicas.next);
ovsdb_txn_abort(txn);
return error;
ovsdb_txn_abort(txn);
return error;
@@
-898,7
+896,7
@@
ovsdb_txn_row_modify(struct ovsdb_txn *txn, const struct ovsdb_row *ro_row_)
struct ovsdb_row *ro_row = CONST_CAST(struct ovsdb_row *, ro_row_);
if (ro_row->txn_row) {
struct ovsdb_row *ro_row = CONST_CAST(struct ovsdb_row *, ro_row_);
if (ro_row->txn_row) {
- assert(ro_row == ro_row->txn_row->new);
+
ovs_
assert(ro_row == ro_row->txn_row->new);
return ro_row;
} else {
struct ovsdb_table *table = ro_row->table;
return ro_row;
} else {
struct ovsdb_table *table = ro_row->table;
@@
-940,7
+938,7
@@
ovsdb_txn_row_delete(struct ovsdb_txn *txn, const struct ovsdb_row *row_)
if (!txn_row) {
ovsdb_txn_row_create(txn, table, row, NULL);
} else {
if (!txn_row) {
ovsdb_txn_row_create(txn, table, row, NULL);
} else {
- assert(txn_row->new == row);
+
ovs_
assert(txn_row->new == row);
if (txn_row->old) {
txn_row->new = NULL;
} else {
if (txn_row->old) {
txn_row->new = NULL;
} else {
@@
-987,7
+985,7
@@
ovsdb_txn_table_destroy(struct ovsdb_txn_table *txn_table)
{
size_t i;
{
size_t i;
- assert(hmap_is_empty(&txn_table->txn_rows));
+
ovs_
assert(hmap_is_empty(&txn_table->txn_rows));
for (i = 0; i < txn_table->table->schema->n_indexes; i++) {
hmap_destroy(&txn_table->txn_indexes[i]);
for (i = 0; i < txn_table->table->schema->n_indexes; i++) {
hmap_destroy(&txn_table->txn_indexes[i]);