From 629cd2f17fedf8d922f61ffd13365d1f4f9b34fe Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Thu, 4 Feb 2010 12:20:11 -0800 Subject: [PATCH] ovsdb: Slightly simplify ovsdb_table_get_row(), ovsdb_table_put_row(). There is no value in saving a call to uuid_hash() in ovsdb_table_put_row(), because uuid_hash() is a trivial inline function, so integrate ovsdb_table_get_row__() into ovsdb_table_get_row() and simplify ovsdb_table_put_row(). --- ovsdb/table.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/ovsdb/table.c b/ovsdb/table.c index e15857be..96d3101f 100644 --- a/ovsdb/table.c +++ b/ovsdb/table.c @@ -192,13 +192,12 @@ ovsdb_table_destroy(struct ovsdb_table *table) } } -static const struct ovsdb_row * -ovsdb_table_get_row__(const struct ovsdb_table *table, const struct uuid *uuid, - size_t hash) +const struct ovsdb_row * +ovsdb_table_get_row(const struct ovsdb_table *table, const struct uuid *uuid) { struct ovsdb_row *row; - HMAP_FOR_EACH_WITH_HASH (row, struct ovsdb_row, hmap_node, hash, + HMAP_FOR_EACH_WITH_HASH (row, struct ovsdb_row, hmap_node, uuid_hash(uuid), &table->rows) { if (uuid_equals(ovsdb_row_get_uuid(row), uuid)) { return row; @@ -208,22 +207,14 @@ ovsdb_table_get_row__(const struct ovsdb_table *table, const struct uuid *uuid, return NULL; } -const struct ovsdb_row * -ovsdb_table_get_row(const struct ovsdb_table *table, const struct uuid *uuid) -{ - return ovsdb_table_get_row__(table, uuid, uuid_hash(uuid)); -} - /* This is probably not the function you want. Use ovsdb_txn_row_modify() * instead. */ bool ovsdb_table_put_row(struct ovsdb_table *table, struct ovsdb_row *row) { const struct uuid *uuid = ovsdb_row_get_uuid(row); - size_t hash = uuid_hash(uuid); - - if (!ovsdb_table_get_row__(table, uuid, hash)) { - hmap_insert(&table->rows, &row->hmap_node, hash); + if (!ovsdb_table_get_row(table, uuid)) { + hmap_insert(&table->rows, &row->hmap_node, uuid_hash(uuid)); return true; } else { return false; -- 2.30.2