git://git.onelab.eu
/
sliver-openvswitch.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.
[sliver-openvswitch.git]
/
ovsdb
/
table.c
diff --git
a/ovsdb/table.c
b/ovsdb/table.c
index
19f4d31
..
0d4f522
100644
(file)
--- a/
ovsdb/table.c
+++ b/
ovsdb/table.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2009, 2010, 2011 Nicira, Inc.
+/* Copyright (c) 2009, 2010, 2011
, 2012
Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-17,7
+17,6
@@
#include "table.h"
#include "table.h"
-#include <assert.h>
#include <limits.h>
#include "json.h"
#include <limits.h>
#include "json.h"
@@
-30,7
+29,7
@@
static void
add_column(struct ovsdb_table_schema *ts, struct ovsdb_column *column)
{
static void
add_column(struct ovsdb_table_schema *ts, struct ovsdb_column *column)
{
- assert(!shash_find(&ts->columns, column->name));
+
ovs_
assert(!shash_find(&ts->columns, column->name));
column->index = shash_count(&ts->columns);
shash_add(&ts->columns, column->name, column);
}
column->index = shash_count(&ts->columns);
shash_add(&ts->columns, column->name, column);
}
@@
-51,11
+50,11
@@
ovsdb_table_schema_create(const char *name, bool mutable,
uuid = ovsdb_column_create("_uuid", false, true, &ovsdb_type_uuid);
add_column(ts, uuid);
uuid = ovsdb_column_create("_uuid", false, true, &ovsdb_type_uuid);
add_column(ts, uuid);
- assert(uuid->index == OVSDB_COL_UUID);
+
ovs_
assert(uuid->index == OVSDB_COL_UUID);
version = ovsdb_column_create("_version", false, false, &ovsdb_type_uuid);
add_column(ts, version);
version = ovsdb_column_create("_version", false, false, &ovsdb_type_uuid);
add_column(ts, version);
- assert(version->index == OVSDB_COL_VERSION);
+
ovs_
assert(version->index == OVSDB_COL_VERSION);
ts->n_indexes = 0;
ts->indexes = NULL;
ts->n_indexes = 0;
ts->indexes = NULL;