[Spice-devel] [PATCH spice-gtk] spice-session: Fix SWAP_STR macro

[Frediano Ziglio]

Really swap "x" and "y", not temporary copies.
The issue was introduced by 01c6343 "Use macro to swap
data in spice_session_start_migrating()".

Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
---
 src/spice-session.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

Removed RFC.
Tested, the original session is updated with the new values
after all connections are established.
As usually there are no other connection after these the
problem is not noted.

diff --git a/src/spice-session.c b/src/spice-session.c
index 04ba124a..d0d9e541 100644
--- a/src/spice-session.c
+++ b/src/spice-session.c
@@ -1742,12 +1742,9 @@ void spice_session_switching_disconnect(SpiceSession *self)
 }
 
 #define SWAP_STR(x, y) G_STMT_START { \
-    const gchar *tmp;                 \
-    const gchar *a = x;               \
-    const gchar *b = y;               \
-    tmp = a;                          \
-    a = b;                            \
-    b = tmp;                          \
+    gchar *tmp = x;                   \
+    x = y;                            \
+    y = tmp;                          \
 } G_STMT_END
 
 G_GNUC_INTERNAL
-- 
2.20.1