Skip to content

Commit

Permalink
Avoid legacy C function definitions
Browse files Browse the repository at this point in the history
These aren't supported in C2x, and clang will already now complain.
  • Loading branch information
CendioOssman committed Aug 15, 2023
1 parent b638faf commit acbe068
Showing 1 changed file with 11 additions and 19 deletions.
30 changes: 11 additions & 19 deletions common/rfb/d3des.c
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,7 @@ 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 deskey(key, edf) /* Thanks to James Gillogly & Phil Karn! */
unsigned char *key;
int edf;
void deskey(unsigned char *key, int edf) /* Thanks to James Gillogly & Phil Karn! */
{
register int i, j, l, m, n;
unsigned char pc1m[56], pcr[56];
Expand Down Expand Up @@ -100,8 +98,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];
Expand All @@ -123,8 +120,7 @@ register unsigned long *raw1;
return;
}

void cpkey(into)
register unsigned long *into;
void cpkey(register unsigned long *into)
{
register unsigned long *from, *endp;

Expand All @@ -133,8 +129,7 @@ register unsigned long *into;
return;
}

void usekey(from)
register unsigned long *from;
void usekey(register unsigned long *from)
{
register unsigned long *to, *endp;

Expand All @@ -143,8 +138,7 @@ register unsigned long *from;
return;
}

void des(inblock, outblock)
unsigned char *inblock, *outblock;
void des(unsigned char *inblock, unsigned char *outblock)
{
unsigned long work[2];

Expand All @@ -154,9 +148,8 @@ 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;
Expand All @@ -169,9 +162,8 @@ 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);
Expand Down Expand Up @@ -328,8 +320,8 @@ 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;
Expand Down

0 comments on commit acbe068

Please sign in to comment.