[Spice-devel] [PATCH spice-streaming-agent 2/2] Do not redefine "msg" field

[Frediano Ziglio]

msg.msg was redefining msg.StreamMsgNotifyError::msg.
This cause some confusion.

Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
---
 src/spice-streaming-agent.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/spice-streaming-agent.cpp b/src/spice-streaming-agent.cpp
index 37addf4..777e330 100644
--- a/src/spice-streaming-agent.cpp
+++ b/src/spice-streaming-agent.cpp
@@ -146,13 +146,13 @@ static void handle_stream_error(size_t len)
     }
 
     struct NotifyError : StreamMsgNotifyError {
-        uint8_t msg[1024];
+        uint8_t msg_buffer[1024];
     } msg;
 
     size_t len_to_read = std::min(len, sizeof(msg) - 1);
 
     read_all(&msg, len_to_read);
-    msg.msg[len_to_read - sizeof(StreamMsgNotifyError)] = '\0';
+    ((uint8_t *) &msg)[len_to_read] = '\0';
 
     syslog(LOG_ERR, "Received NotifyError message from the server: %d - %s\n",
         msg.error_code, msg.msg);
-- 
2.14.3