[ovs-dev] [PATCH 08/19] jsonrpc-server: rename ovsdb_jsonrpc_monitor_get_initial()
Andy Zhou
azhou at nicira.com
Fri Apr 10 00:11:27 UTC 2015
rename ovsdb_jsonrpc_monitor_get_initial() to
ovsdb_monitor_get_initial()
Signed-off-by: Andy Zhou <azhou at nicira.com>
Acked-by: Ben Pfaff <blp at nicira.com>
---
v1->v2: no change
---
ovsdb/jsonrpc-server.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/ovsdb/jsonrpc-server.c b/ovsdb/jsonrpc-server.c
index 04be80c..362cc66 100644
--- a/ovsdb/jsonrpc-server.c
+++ b/ovsdb/jsonrpc-server.c
@@ -1093,8 +1093,8 @@ static const struct ovsdb_replica_class ovsdb_jsonrpc_replica_class;
struct ovsdb_jsonrpc_monitor *ovsdb_jsonrpc_monitor_find(
struct ovsdb_jsonrpc_session *, const struct json *monitor_id);
static void ovsdb_monitor_destroy(struct ovsdb_replica *);
-static struct json *ovsdb_jsonrpc_monitor_get_initial(
- const struct ovsdb_jsonrpc_monitor *);
+static struct json *ovsdb_monitor_get_initial(
+ const struct ovsdb_monitor *);
static bool
parse_bool(struct ovsdb_parser *parser, const char *name, bool default_value)
@@ -1384,7 +1384,7 @@ ovsdb_jsonrpc_monitor_create(struct ovsdb_jsonrpc_session *s, struct ovsdb *db,
}
}
- return jsonrpc_create_reply(ovsdb_jsonrpc_monitor_get_initial(m),
+ return jsonrpc_create_reply(ovsdb_monitor_get_initial(m->dbmon),
request_id);
error:
@@ -1811,14 +1811,14 @@ ovsdb_monitor_commit(struct ovsdb_replica *replica,
}
static struct json *
-ovsdb_jsonrpc_monitor_get_initial(const struct ovsdb_jsonrpc_monitor *m)
+ovsdb_monitor_get_initial(const struct ovsdb_monitor *dbmon)
{
struct ovsdb_monitor_aux aux;
struct shash_node *node;
struct json *json;
- ovsdb_monitor_init_aux(&aux, m->dbmon);
- SHASH_FOR_EACH (node, &m->dbmon->tables) {
+ ovsdb_monitor_init_aux(&aux, dbmon);
+ SHASH_FOR_EACH (node, &dbmon->tables) {
struct ovsdb_monitor_table *mt = node->data;
if (mt->select & OJMS_INITIAL) {
@@ -1829,7 +1829,7 @@ ovsdb_jsonrpc_monitor_get_initial(const struct ovsdb_jsonrpc_monitor *m)
}
}
}
- json = ovsdb_jsonrpc_monitor_compose_table_update(m, true);
+ json = ovsdb_monitor_compose_table_update(dbmon, true);
return json ? json : json_object_create();
}
--
1.9.1
More information about the dev
mailing list