--- sourceforge.net/trunk/rdesktop/xwin.c	2004/05/11 07:34:03	695
+++ sourceforge.net/trunk/rdesktop/xwin.c	2004/05/11 13:45:57	697
@@ -252,27 +252,28 @@
 	uint16 value;
 
 	if (g_arch_match)
-		REPEAT(*((uint16*)out) = g_colmap[*(data++)]; out += 2;
+		REPEAT(*((uint16 *) out) = g_colmap[*(data++)]; out += 2;
 		)
-	else if (g_xserver_be)
+	else
+if (g_xserver_be)
+{
+	while (out < end)
 	{
-		while (out < end)
-		{
-			value = (uint16) g_colmap[*(data++)];
-			*(out++) = value >> 8;
-			*(out++) = value;
-		}
+		value = (uint16) g_colmap[*(data++)];
+		*(out++) = value >> 8;
+		*(out++) = value;
 	}
-	else
+}
+else
+{
+	while (out < end)
 	{
-		while (out < end)
-		{
-			value = (uint16) g_colmap[*(data++)];
-			*(out++) = value;
-			*(out++) = value >> 8;
-		}
+		value = (uint16) g_colmap[*(data++)];
+		*(out++) = value;
+		*(out++) = value >> 8;
 	}
 }
+}
 
 /* little endian - conversion happens when colourmap is built */
 static void
@@ -308,31 +309,32 @@
 	uint32 value;
 
 	if (g_arch_match)
-		REPEAT(*((uint32 *)out) = g_colmap[*(data++)]; out += 4;
+		REPEAT(*((uint32 *) out) = g_colmap[*(data++)]; out += 4;
 		)
-	else if (g_xserver_be)
+	else
+if (g_xserver_be)
+{
+	while (out < end)
 	{
-		while (out < end)
-		{
-			value = g_colmap[*(data++)];
-			*(out++) = value >> 24;
-			*(out++) = value >> 16;
-			*(out++) = value >> 8;
-			*(out++) = value;
-		}
+		value = g_colmap[*(data++)];
+		*(out++) = value >> 24;
+		*(out++) = value >> 16;
+		*(out++) = value >> 8;
+		*(out++) = value;
 	}
-	else
+}
+else
+{
+	while (out < end)
 	{
-		while (out < end)
-		{
-			value = g_colmap[*(data++)];
-			*(out++) = value;
-			*(out++) = value >> 8;
-			*(out++) = value >> 16;
-			*(out++) = value >> 24;
-		}
+		value = g_colmap[*(data++)];
+		*(out++) = value;
+		*(out++) = value >> 8;
+		*(out++) = value >> 16;
+		*(out++) = value >> 24;
 	}
 }
+}
 
 static void
 translate15to16(uint16 * data, uint8 * out, uint8 * end)