From: Andy Zhou <azhou@nicira.com>
Date: Thu, 12 Mar 2015 01:02:53 +0000 (-0700)
Subject: jsonrpc-server: make setting mt->select into its own functions
X-Git-Tag: v2.4.0~170
X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Fovs.git;a=commitdiff_plain;h=f3395ab3226b29b6e5460706b066189a40983595

jsonrpc-server: make setting mt->select into its own functions

To make ovsdb_monitor an opaque to ovsdb_jsonrpc server object.

Signed-off-by: Andy Zhou <azhou@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/ovsdb/jsonrpc-server.c b/ovsdb/jsonrpc-server.c
index 76755856c..a70ed383a 100644
--- a/ovsdb/jsonrpc-server.c
+++ b/ovsdb/jsonrpc-server.c
@@ -1147,6 +1147,13 @@ compare_ovsdb_monitor_column(const void *a_, const void *b_)
     return a->column < b->column ? -1 : a->column > b->column;
 }
 
+static void
+ovsdb_monitor_add_select(struct ovsdb_monitor_table *mt,
+                         enum ovsdb_monitor_selection select)
+{
+    mt->select |= select;
+}
+
 static struct ovsdb_error * OVS_WARN_UNUSED_RESULT
 ovsdb_jsonrpc_parse_monitor_request(struct ovsdb_monitor_table *mt,
                                     const struct json *monitor_request,
@@ -1189,8 +1196,8 @@ ovsdb_jsonrpc_parse_monitor_request(struct ovsdb_monitor_table *mt,
     } else {
         select = OJMS_INITIAL | OJMS_INSERT | OJMS_DELETE | OJMS_MODIFY;
     }
-    mt->select |= select;
 
+    ovsdb_monitor_add_select(mt, select);
     if (columns) {
         size_t i;