[Spice-devel] [PATCH 4/7] Make struct AsyncRead/async_read_handler private

[Christophe Fergeau]

All users are now contained in reds_stream.c
---
 server/reds_stream.c | 12 +++++++++++-
 server/reds_stream.h | 11 -----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/server/reds_stream.c b/server/reds_stream.c
index cb42561..9041033 100644
--- a/server/reds_stream.c
+++ b/server/reds_stream.c
@@ -33,6 +33,16 @@
 
 #include <openssl/err.h>
 
+struct AsyncRead {
+    RedsStream *stream;
+    void *opaque;
+    uint8_t *now;
+    uint8_t *end;
+    AsyncReadDone done;
+    AsyncReadError error;
+};
+typedef struct AsyncRead AsyncRead;
+
 extern SpiceCoreInterface *core;
 
 #if HAVE_SASL
@@ -399,7 +409,7 @@ static inline void async_read_clear_handlers(AsyncRead *obj)
     obj->stream = NULL;
 }
 
-void async_read_handler(int fd, int event, void *data)
+static void async_read_handler(int fd, int event, void *data)
 {
     AsyncRead *obj = (AsyncRead *)data;
 
diff --git a/server/reds_stream.h b/server/reds_stream.h
index a5b7a17..6cbbbbb 100644
--- a/server/reds_stream.h
+++ b/server/reds_stream.h
@@ -29,17 +29,6 @@ typedef void (*AsyncReadDone)(void *opaque);
 typedef void (*AsyncReadError)(void *opaque, int err);
 
 typedef struct RedsStream RedsStream;
-typedef struct AsyncRead {
-    RedsStream *stream;
-    void *opaque;
-    uint8_t *now;
-    uint8_t *end;
-    AsyncReadDone done;
-    AsyncReadError error;
-} AsyncRead;
-
-void async_read_handler(int fd, int event, void *data);
-
 typedef struct RedsStreamPrivate RedsStreamPrivate;
 
 struct RedsStream {
-- 
1.8.5.3