projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change logging format for flows to that accepted by ofproto/trace.
[openvswitch]
/
ovsdb
/
row.c
diff --git
a/ovsdb/row.c
b/ovsdb/row.c
index 457869b38cdbdade316885bb4c9bcdcec9bed501..450c3274543230bc2cd3170b9412b1997d67dfa8 100644
(file)
--- a/
ovsdb/row.c
+++ b/
ovsdb/row.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.
@@
-36,7
+36,7
@@
allocate_row(const struct ovsdb_table *table)
+ sizeof(struct ovsdb_datum) * n_fields
+ sizeof(struct hmap_node) * n_indexes);
struct ovsdb_row *row = xmalloc(row_size);
+ sizeof(struct ovsdb_datum) * n_fields
+ sizeof(struct hmap_node) * n_indexes);
struct ovsdb_row *row = xmalloc(row_size);
- row->table =
(struct ovsdb_table *) table
;
+ row->table =
CONST_CAST(struct ovsdb_table *, table)
;
row->txn_row = NULL;
list_init(&row->src_refs);
list_init(&row->dst_refs);
row->txn_row = NULL;
list_init(&row->src_refs);
list_init(&row->dst_refs);
@@
-347,7
+347,7
@@
ovsdb_row_hash_destroy(struct ovsdb_row_hash *rh, bool destroy_rows)
HMAP_FOR_EACH_SAFE (node, next, hmap_node, &rh->rows) {
hmap_remove(&rh->rows, &node->hmap_node);
if (destroy_rows) {
HMAP_FOR_EACH_SAFE (node, next, hmap_node, &rh->rows) {
hmap_remove(&rh->rows, &node->hmap_node);
if (destroy_rows) {
- ovsdb_row_destroy(
(struct ovsdb_row *) node->row
);
+ ovsdb_row_destroy(
CONST_CAST(struct ovsdb_row *, node->row)
);
}
free(node);
}
}
free(node);
}