--- sourceforge.net/trunk/rdesktop/iso.c	2003/06/16 09:03:55	422
+++ sourceforge.net/trunk/rdesktop/iso.c	2003/06/17 08:44:32	423
@@ -77,10 +77,9 @@
 	STREAM s;
 	uint16 length;
 	uint8 version;
-	BOOL shortform = False;	// Shut the compiler up.
 
       next_packet:
-	s = tcp_recv(4);
+	s = tcp_recv(NULL, 4);
 	if (s == NULL)
 		return NULL;
 
@@ -93,11 +92,6 @@
 			{
 				length &= ~0x80;
 				next_be(s, length);
-				shortform = False;
-			}
-			else
-			{
-				shortform = True;
 			}
 			break;
 
@@ -111,13 +105,13 @@
 			return NULL;
 	}
 
-	s = tcp_recv(length - 4);
+	s = tcp_recv(s, length - 4);
 	if (s == NULL)
 		return NULL;
 
 	if ((version & 3) == 0)
 	{
-		rdp5_process(s, version & 0x80, shortform);
+		rdp5_process(s, version & 0x80);
 		goto next_packet;
 	}