-/* 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.
#include "table.h"
-#include <assert.h>
#include <limits.h>
#include "json.h"
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);
}
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);
- assert(version->index == OVSDB_COL_VERSION);
+ ovs_assert(version->index == OVSDB_COL_VERSION);
ts->n_indexes = 0;
ts->indexes = NULL;
* The "isRoot" member is included in the JSON only if its value would differ
* from 'default_is_root'. Ordinarily 'default_is_root' should be false,
* because ordinarily a table would be not be part of the root set if its
- * "isRoot" member is omitted. However, garbage collection was not orginally
+ * "isRoot" member is omitted. However, garbage collection was not originally
* included in OVSDB, so in older schemas that do not include any "isRoot"
* members, every table is implicitly part of the root set. To serialize such
* a schema in a way that can be read by older OVSDB tools, specify