remove k&r functions per 1579342

1 files changed, 9 insertions, 19 deletions

diff --git a/common/d3des.c b/common/d3des.c
index 21362ad7..16ec35df 100644
--- a/common/d3des.c
+++ b/common/d3des.c
@@ -71,9 +71,8 @@ static unsigned char pc2[48] = {
 	40, 51, 30, 36, 46, 54, 29, 39, 50, 44, 32, 47,
 	43, 48, 38, 55, 33, 52, 45, 41, 49, 35, 28, 31 };
 
-void rfbDesKey(key, edf)	/* Thanks to James Gillogly & Phil Karn! */
-unsigned char *key;
-int edf;
+/* Thanks to James Gillogly & Phil Karn! */
+void rfbDesKey(unsigned char *key, int edf)
 {
 	register int i, j, l, m, n;
 	unsigned char pc1m[56], pcr[56];
@@ -108,8 +107,7 @@ int edf;
 	return;
 	}
 
-static void cookey(raw1)
-register unsigned long *raw1;
+static void cookey(register unsigned long *raw1)
 {
 	register unsigned long *cook, *raw0;
 	unsigned long dough[32];
@@ -131,8 +129,7 @@ register unsigned long *raw1;
 	return;
 	}
 
-void rfbCPKey(into)
-register unsigned long *into;
+void rfbCPKey(register unsigned long *into)
 {
 	register unsigned long *from, *endp;
 
@@ -141,8 +138,7 @@ register unsigned long *into;
 	return;
 	}
 
-void rfbUseKey(from)
-register unsigned long *from;
+void rfbUseKey(register unsigned long *from)
 {
 	register unsigned long *to, *endp;
 
@@ -151,8 +147,7 @@ register unsigned long *from;
 	return;
 	}
 
-void rfbDes(inblock, outblock)
-unsigned char *inblock, *outblock;
+void rfbDes(unsigned char *inblock, unsigned char *outblock)
 {
 	unsigned long work[2];
 
@@ -162,9 +157,7 @@ unsigned char *inblock, *outblock;
 	return;
 	}
 
-static void scrunch(outof, into)
-register unsigned char *outof;
-register unsigned long *into;
+static void scrunch(register unsigned char *outof, register unsigned long *into)
 {
 	*into	 = (*outof++ & 0xffL) << 24;
 	*into	|= (*outof++ & 0xffL) << 16;
@@ -177,9 +170,7 @@ register unsigned long *into;
 	return;
 	}
 
-static void unscrun(outof, into)
-register unsigned long *outof;
-register unsigned char *into;
+static void unscrun(register unsigned long *outof, register unsigned char *into)
 {
 	*into++ = (unsigned char)((*outof >> 24) & 0xffL);
 	*into++ = (unsigned char)((*outof >> 16) & 0xffL);
@@ -336,8 +327,7 @@ static unsigned long SP8[64] = {
 	0x10041040L, 0x00041000L, 0x00041000L, 0x00001040L,
 	0x00001040L, 0x00040040L, 0x10000000L, 0x10041000L };
 
-static void desfunc(block, keys)
-register unsigned long *block, *keys;
+static void desfunc(register unsigned long* block, register unsigned long *keys)
 {
 	register unsigned long fval, work, right, leftt;
 	register int round;