[Spice-devel] [PATCH 07/15] Change reds_num_of_clients() to take RedsState arg

Frediano Ziglio fziglio at redhat.com
Mon Jan 18 08:38:01 PST 2016


From: Jonathon Jongsma <jjongsma at redhat.com>

---
 server/reds.c | 4 ++--
 server/reds.h | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/server/reds.c b/server/reds.c
index 9b28a7c..0169fac 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -897,7 +897,7 @@ int reds_num_of_channels(RedsState *reds)
 }
 
 
-int reds_num_of_clients(void)
+static int reds_num_of_clients(RedsState *reds)
 {
     return reds ? reds->num_clients : 0;
 }
@@ -905,7 +905,7 @@ int reds_num_of_clients(void)
 SPICE_GNUC_VISIBLE int spice_server_get_num_clients(SpiceServer *s)
 {
     spice_assert(reds == s);
-    return reds_num_of_clients();
+    return reds_num_of_clients(reds);
 }
 
 static int secondary_channels[] = {
diff --git a/server/reds.h b/server/reds.h
index 65e8f69..aaa9477 100644
--- a/server/reds.h
+++ b/server/reds.h
@@ -88,7 +88,6 @@ typedef struct MainMigrateData MainMigrateData;
 void reds_marshall_migrate_data(SpiceMarshaller *m);
 void reds_fill_channels(SpiceMsgChannels *channels_info);
 int reds_num_of_channels(RedsState *reds);
-int reds_num_of_clients(void);
 #ifdef RED_STATISTICS
 void reds_update_stat_value(uint32_t value);
 #endif
-- 
2.4.3



More information about the Spice-devel mailing list