--- sourceforge.net/trunk/rdesktop/bitmap.c	2003/02/10 12:56:34	317
+++ sourceforge.net/trunk/rdesktop/bitmap.c	2003/02/10 12:58:51	318
@@ -22,7 +22,8 @@
 
 #define CVAL(p)   (*(p++))
 
-uint32 cvalx(unsigned char **input, int Bpp)
+uint32
+cvalx(unsigned char **input, int Bpp)
 {
 	uint32 rv = 0;
 	memcpy(&rv, *input, Bpp);
@@ -30,13 +31,15 @@
 	return rv;
 }
 
-void setli(unsigned char * input, int offset, uint32 value, int Bpp)
+void
+setli(unsigned char *input, int offset, uint32 value, int Bpp)
 {
 	input += offset * Bpp;
 	memcpy(input, &value, Bpp);
 }
 
-uint32 getli(unsigned char * input, int offset, int Bpp)
+uint32
+getli(unsigned char *input, int offset, int Bpp)
 {
 	uint32 rv = 0;
 	input += offset * Bpp;
@@ -65,7 +68,8 @@
 }
 
 BOOL
-bitmap_decompress(unsigned char *output, int width, int height, unsigned char *input, int size, int Bpp)
+bitmap_decompress(unsigned char *output, int width, int height, unsigned char *input, int size,
+		  int Bpp)
 {
 	unsigned char *end = input + size;
 	unsigned char *prevline = NULL, *line = NULL;
@@ -189,7 +193,8 @@
 						if (prevline == NULL)
 							setli(line, x, mix, Bpp);
 						else
-							setli(line, x, getli(prevline, x, Bpp) ^ mix, Bpp);
+							setli(line, x,
+							      getli(prevline, x, Bpp) ^ mix, Bpp);
 
 						insertmix = False;
 						count--;
@@ -198,11 +203,11 @@
 
 					if (prevline == NULL)
 					{
-						REPEAT(setli(line, x, 0, Bpp))
-					}
+					REPEAT(setli(line, x, 0, Bpp))}
 					else
 					{
-						REPEAT(setli(line, x, getli(prevline, x, Bpp), Bpp));
+						REPEAT(setli
+						       (line, x, getli(prevline, x, Bpp), Bpp));
 					}
 					break;
 
@@ -213,7 +218,9 @@
 					}
 					else
 					{
-						REPEAT(setli(line, x, getli(prevline, x, Bpp) ^ mix, Bpp));
+						REPEAT(setli
+						       (line, x, getli(prevline, x, Bpp) ^ mix,
+							Bpp));
 					}
 					break;
 
@@ -229,9 +236,11 @@
 					{
 						REPEAT(MASK_UPDATE();
 						       if (mask & mixmask)
-						       setli(line, x, getli(prevline, x, Bpp) ^ mix, Bpp);
+						       setli(line, x, getli(prevline, x, Bpp) ^ mix,
+							     Bpp);
 						       else
-						       setli(line, x, getli(prevline, x, Bpp), Bpp););
+						       setli(line, x, getli(prevline, x, Bpp),
+							     Bpp););
 					}
 					break;
 
@@ -249,7 +258,8 @@
 					       setli(line, x, colour2, Bpp); bicolour = False;}
 					       else
 					       {
-					       setli(line, x, colour1, Bpp); bicolour = True; count++;}
+					       setli(line, x, colour1, Bpp); bicolour = True;
+					       count++;}
 					);
 					break;
 
@@ -270,4 +280,3 @@
 
 	return True;
 }
-