--- sourceforge.net/trunk/rdesktop/cache.c	2001/06/20 13:54:48	28
+++ sourceforge.net/trunk/rdesktop/cache.c	2002/07/18 16:38:31	64
@@ -1,7 +1,7 @@
 /*
    rdesktop: A Remote Desktop Protocol client.
    Cache routines
-   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
@@ -40,7 +40,7 @@
 			return bitmap;
 	}
 
-	ERROR("get bitmap %d:%d\n", cache_id, cache_idx);
+	error("get bitmap %d:%d\n", cache_id, cache_idx);
 	return NULL;
 }
 
@@ -61,7 +61,7 @@
 	}
 	else
 	{
-		ERROR("put bitmap %d:%d\n", cache_id, cache_idx);
+		error("put bitmap %d:%d\n", cache_id, cache_idx);
 	}
 }
 
@@ -83,7 +83,7 @@
 			return glyph;
 	}
 
-	ERROR("get font %d:%d\n", font, character);
+	error("get font %d:%d\n", font, character);
 	return NULL;
 }
 
@@ -109,7 +109,7 @@
 	}
 	else
 	{
-		ERROR("put font %d:%d\n", font, character);
+		error("put font %d:%d\n", font, character);
 	}
 }
 
@@ -130,7 +130,7 @@
 			return text;
 	}
 
-	ERROR("get text %d\n", cache_id);
+	error("get text %d\n", cache_id);
 	return NULL;
 }
 
@@ -152,7 +152,7 @@
 	}
 	else
 	{
-		ERROR("put text %d\n", cache_id);
+		error("put text %d\n", cache_id);
 	}
 }
 
@@ -171,14 +171,14 @@
 		return &deskcache[offset];
 	}
 
-	ERROR("get desktop %d:%d\n", offset, length);
+	error("get desktop %d:%d\n", offset, length);
 	return NULL;
 }
 
 /* Store desktop data in the cache */
 void
 cache_put_desktop(uint32 offset, int cx, int cy, int scanline,
-		  int bytes_per_pixel, uint8 *data)
+		  int bytes_per_pixel, uint8 * data)
 {
 	int length = cx * cy * bytes_per_pixel;
 
@@ -194,7 +194,7 @@
 	}
 	else
 	{
-		ERROR("put desktop %d:%d\n", offset, length);
+		error("put desktop %d:%d\n", offset, length);
 	}
 }
 
@@ -203,7 +203,8 @@
 static HCURSOR cursorcache[0x20];
 
 /* Retrieve cursor from cache */
-HCURSOR cache_get_cursor(uint16 cache_idx)
+HCURSOR
+cache_get_cursor(uint16 cache_idx)
 {
 	HCURSOR cursor;
 
@@ -214,7 +215,7 @@
 			return cursor;
 	}
 
-	ERROR("get cursor %d\n", cache_idx);
+	error("get cursor %d\n", cache_idx);
 	return NULL;
 }
 
@@ -234,6 +235,6 @@
 	}
 	else
 	{
-		ERROR("put cursor %d\n", cache_idx);
+		error("put cursor %d\n", cache_idx);
 	}
 }