From 0dc5b4165536d0792f04dd510877c4540dbf73c0 Mon Sep 17 00:00:00 2001
From: dd
Date: Mon, 25 Jun 2001 21:25:27 +0000
Subject: Silence -Wshadow and -Wmissing-prototypes; set WARNS=2.
Submitted by: Mike Barcroft
---
usr.bin/enigma/enigma.c | 28 +++++++++++++++-------------
1 file changed, 15 insertions(+), 13 deletions(-)
(limited to 'usr.bin/enigma/enigma.c')
diff --git a/usr.bin/enigma/enigma.c b/usr.bin/enigma/enigma.c
index 87ed653..546b144 100644
--- a/usr.bin/enigma/enigma.c
+++ b/usr.bin/enigma/enigma.c
@@ -35,13 +35,14 @@ char deck[ROTORSZ];
char buf[13];
void shuffle(char *);
+void setup(char *);
void
setup(pw)
char *pw;
{
int ic, i, k, temp, pf[2], pid;
- unsigned random;
+ unsigned rnd;
long seed;
strncpy(buf, pw, 8);
@@ -92,15 +93,15 @@ setup(pw)
else
seed &= 0x7FFFFFFF;
}
- random = seed % 65521;
+ rnd = seed % 65521;
k = ROTORSZ-1 - i;
- ic = (random&MASK)%(k+1);
- random >>= 8;
+ ic = (rnd&MASK)%(k+1);
+ rnd >>= 8;
temp = t1[k];
t1[k] = t1[ic];
t1[ic] = temp;
if(t3[k]!=0) continue;
- ic = (random&MASK) % k;
+ ic = (rnd&MASK) % k;
while(t3[ic]!=0) ic = (ic+1) % k;
t3[k] = ic;
t3[ic] = k;
@@ -111,6 +112,7 @@ setup(pw)
int
main(argc, argv)
+ int argc;
char *argv[];
{
register int i, n1, n2, nr1, nr2;
@@ -169,20 +171,20 @@ main(argc, argv)
}
void
-shuffle(deck)
- char deck[];
+shuffle(deckary)
+ char deckary[];
{
int i, ic, k, temp;
- unsigned random;
+ unsigned rnd;
static long seed = 123;
for(i=0;i