--- sourceforge.net/trunk/rdesktop/iso.c	2001/01/06 03:12:10	24
+++ sourceforge.net/trunk/rdesktop/iso.c	2002/09/26 14:26:46	207
@@ -1,7 +1,7 @@
 /*
    rdesktop: A Remote Desktop Protocol client.
    Protocol services - ISO layer
-   Copyright (C) Matthew Chapman 1999-2000
+   Copyright (C) Matthew Chapman 1999-2002
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,7 +21,8 @@
 #include "rdesktop.h"
 
 /* Send a self-contained ISO PDU */
-static void iso_send_msg(uint8 code)
+static void
+iso_send_msg(uint8 code)
 {
 	STREAM s;
 
@@ -42,7 +43,8 @@
 }
 
 /* Receive a message on the ISO layer, return code */
-static STREAM iso_recv_msg(uint8 *code)
+static STREAM
+iso_recv_msg(uint8 * code)
 {
 	STREAM s;
 	uint16 length;
@@ -50,13 +52,13 @@
 
 	s = tcp_recv(4);
 	if (s == NULL)
-		return False;
+		return NULL;
 
 	in_uint8(s, version);
 	if (version != 3)
 	{
-		ERROR("TPKT v%d\n", version);
-		return False;
+		error("TPKT v%d\n", version);
+		return NULL;
 	}
 
 	in_uint8s(s, 1);	/* pad */
@@ -64,7 +66,7 @@
 
 	s = tcp_recv(length - 4);
 	if (s == NULL)
-		return False;
+		return NULL;
 
 	in_uint8s(s, 1);	/* hdrlen */
 	in_uint8(s, *code);
@@ -80,7 +82,8 @@
 }
 
 /* Initialise ISO transport data packet */
-STREAM iso_init(int length)
+STREAM
+iso_init(int length)
 {
 	STREAM s;
 
@@ -91,7 +94,8 @@
 }
 
 /* Send an ISO data PDU */
-void iso_send(STREAM s)
+void
+iso_send(STREAM s)
 {
 	uint16 length;
 
@@ -110,23 +114,28 @@
 }
 
 /* Receive ISO transport data packet */
-STREAM iso_recv()
+STREAM
+iso_recv(void)
 {
 	STREAM s;
 	uint8 code;
 
 	s = iso_recv_msg(&code);
-	if ((s == NULL) || (code != ISO_PDU_DT))
+	if (s == NULL)
+		return NULL;
+
+	if (code != ISO_PDU_DT)
 	{
-		ERROR("expected DT, got %d\n", code);
-		return False;
+		error("expected DT, got 0x%x\n", code);
+		return NULL;
 	}
 
 	return s;
 }
 
 /* Establish a connection up to the ISO layer */
-BOOL iso_connect(char *server)
+BOOL
+iso_connect(char *server)
 {
 	uint8 code;
 
@@ -135,9 +144,12 @@
 
 	iso_send_msg(ISO_PDU_CR);
 
-	if ((iso_recv_msg(&code) == NULL) || (code != ISO_PDU_CC))
+	if (iso_recv_msg(&code) == NULL)
+		return False;
+
+	if (code != ISO_PDU_CC)
 	{
-		ERROR("expected CC, got %d\n", code);
+		error("expected CC, got 0x%x\n", code);
 		tcp_disconnect();
 		return False;
 	}
@@ -146,7 +158,8 @@
 }
 
 /* Disconnect from the ISO layer */
-void iso_disconnect()
+void
+iso_disconnect(void)
 {
 	iso_send_msg(ISO_PDU_DR);
 	tcp_disconnect();