--- sourceforge.net/trunk/rdesktop/mcs.c	2001/09/14 03:38:39	29
+++ sourceforge.net/trunk/rdesktop/mcs.c	2001/09/14 13:51:38	30
@@ -1,7 +1,7 @@
 /*
    rdesktop: A Remote Desktop Protocol client.
    Protocol services - Multipoint Communications Service
-   Copyright (C) Matthew Chapman 1999-2000
+   Copyright (C) Matthew Chapman 1999-2001
    
    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
@@ -38,7 +38,7 @@
 
 	if (tag != tagval)
 	{
-		ERROR("expected tag %d, got %d\n", tagval, tag);
+		error("expected tag %d, got %d\n", tagval, tag);
 		return False;
 	}
 
@@ -161,7 +161,7 @@
 	in_uint8(s, result);
 	if (result != 0)
 	{
-		ERROR("MCS connect: %d\n", result);
+		error("MCS connect: %d\n", result);
 		return False;
 	}
 
@@ -172,7 +172,7 @@
 	ber_parse_header(s, BER_TAG_OCTET_STRING, &length);
 	if (length > mcs_data->size)
 	{
-		WARN("MCS data length %d\n", length);
+		error("MCS data length %d\n", length);
 		length = mcs_data->size;
 	}
 
@@ -227,14 +227,14 @@
 	in_uint8(s, opcode);
 	if ((opcode >> 2) != MCS_AUCF)
 	{
-		ERROR("expected AUcf, got %d\n", opcode);
+		error("expected AUcf, got %d\n", opcode);
 		return False;
 	}
 
 	in_uint8(s, result);
 	if (result != 0)
 	{
-		ERROR("AUrq: %d\n", result);
+		error("AUrq: %d\n", result);
 		return False;
 	}
 
@@ -274,14 +274,14 @@
 	in_uint8(s, opcode);
 	if ((opcode >> 2) != MCS_CJCF)
 	{
-		ERROR("expected CJcf, got %d\n", opcode);
+		error("expected CJcf, got %d\n", opcode);
 		return False;
 	}
 
 	in_uint8(s, result);
 	if (result != 0)
 	{
-		ERROR("CJrq: %d\n", result);
+		error("CJrq: %d\n", result);
 		return False;
 	}
 
@@ -340,7 +340,7 @@
 	{
 		if (appid != MCS_DPUM)
 		{
-			ERROR("expected data, got %d\n", opcode);
+			error("expected data, got %d\n", opcode);
 		}
 		return NULL;
 	}