-Wshadow nits.

5 files changed, 19 insertions, 19 deletions

diff --git a/sbin/isakmpd/exchange.c b/sbin/isakmpd/exchange.c
index 5d70ad05723..57704ca9d2b 100644
--- a/sbin/isakmpd/exchange.c
+++ b/sbin/isakmpd/exchange.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exchange.c,v 1.73 2002/11/15 14:58:38 ho Exp $	*/
+/*	$OpenBSD: exchange.c,v 1.74 2002/11/21 12:09:20 ho Exp $	*/
 /*	$EOM: exchange.c,v 1.143 2000/12/04 00:02:25 angelos Exp $	*/
 
 /*
@@ -1498,7 +1498,7 @@ exchange_finalize (struct message *msg)
    */
   while (TAILQ_FIRST (&exchange->sa_list))
     {
-      struct sa *sa = TAILQ_FIRST (&exchange->sa_list);
+      sa = TAILQ_FIRST (&exchange->sa_list);
 
       if (exchange->id_i && exchange->id_r)
 	{
diff --git a/sbin/isakmpd/hash.c b/sbin/isakmpd/hash.c
index 24d672bfb20..68474e2629c 100644
--- a/sbin/isakmpd/hash.c
+++ b/sbin/isakmpd/hash.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hash.c,v 1.11 2002/11/21 09:40:34 ho Exp $	*/
+/*	$OpenBSD: hash.c,v 1.12 2002/11/21 12:09:20 ho Exp $	*/
 /*	$EOM: hash.c,v 1.10 1999/04/17 23:20:34 niklas Exp $	*/
 
 /*
@@ -139,9 +139,9 @@ hmac_init (struct hash *hash, unsigned char *okey, unsigned int len)
  */
 
 void
-hmac_final (unsigned char *digest, struct hash *hash)
+hmac_final (unsigned char *dgst, struct hash *hash)
 {
-  hash->Final (digest, hash->ctx);
-  hash->Update (hash->ctx2, digest, hash->hashsize);
-  hash->Final (digest, hash->ctx2);
+  hash->Final (dgst, hash->ctx);
+  hash->Update (hash->ctx2, dgst, hash->hashsize);
+  hash->Final (dgst, hash->ctx2);
 }
diff --git a/sbin/isakmpd/ipsec.c b/sbin/isakmpd/ipsec.c
index 762f9f1b3ce..372d69a8181 100644
--- a/sbin/isakmpd/ipsec.c
+++ b/sbin/isakmpd/ipsec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipsec.c,v 1.71 2002/09/11 09:50:43 ho Exp $	*/
+/*	$OpenBSD: ipsec.c,v 1.72 2002/11/21 12:09:20 ho Exp $	*/
 /*	$EOM: ipsec.c,v 1.143 2000/12/11 23:57:42 niklas Exp $	*/
 
 /*
@@ -903,7 +903,7 @@ static int
 ipsec_initiator (struct message *msg)
 {
   struct exchange *exchange = msg->exchange;
-  int (**script) (struct message *msg) = 0;
+  int (**script) (struct message *) = 0;
 
   /* Check that the SA is coherent with the IKE rules.  */
   if (exchange->type != ISAKMP_EXCH_TRANSACTION
@@ -1042,7 +1042,7 @@ static int
 ipsec_responder (struct message *msg)
 {
   struct exchange *exchange = msg->exchange;
-  int (**script) (struct message *msg) = 0;
+  int (**script) (struct message *) = 0;
   struct payload *p;
   u_int16_t type;
 
diff --git a/sbin/isakmpd/isakmpd.c b/sbin/isakmpd/isakmpd.c
index d402db52948..437b24eb892 100644
--- a/sbin/isakmpd/isakmpd.c
+++ b/sbin/isakmpd/isakmpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isakmpd.c,v 1.45 2002/07/05 13:58:50 ho Exp $	*/
+/*	$OpenBSD: isakmpd.c,v 1.46 2002/11/21 12:09:20 ho Exp $	*/
 /*	$EOM: isakmpd.c,v 1.54 2000/10/05 09:28:22 niklas Exp $	*/
 
 /*
@@ -224,14 +224,14 @@ sighup (int sig)
 static void
 report (void)
 {
-  FILE *report, *old;
+  FILE *rfp, *old;
   mode_t old_umask;
 
   old_umask = umask (S_IRWXG | S_IRWXO);
-  report = fopen (report_file, "w");
+  rfp = fopen (report_file, "w");
   umask (old_umask);
 
-  if (!report)
+  if (!rfp)
     {
       log_error ("fopen (\"%s\", \"w\") failed", report_file);
       return;
@@ -239,10 +239,10 @@ report (void)
 
   /* Divert the log channel to the report file during the report.  */
   old = log_current ();
-  log_to (report);
+  log_to (rfp);
   ui_report ("r");
   log_to (old);
-  fclose (report);
+  fclose (rfp);
 
   sigusr1ed = 0;
 }
diff --git a/sbin/isakmpd/sa.c b/sbin/isakmpd/sa.c
index 894b085729d..90101de08ff 100644
--- a/sbin/isakmpd/sa.c
+++ b/sbin/isakmpd/sa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sa.c,v 1.64 2002/09/08 12:38:04 ho Exp $	*/
+/*	$OpenBSD: sa.c,v 1.65 2002/11/21 12:09:20 ho Exp $	*/
 /*	$EOM: sa.c,v 1.112 2000/12/12 00:22:52 niklas Exp $	*/
 
 /*
@@ -471,7 +471,7 @@ sa_dump (int cls, int level, char *header, struct sa *sa)
  * Display the SA's two SPI values.
  */
 static void
-report_spi (FILE *fd, const u_int8_t *buf, size_t sz, int index)
+report_spi (FILE *fd, const u_int8_t *buf, size_t sz, int spi)
 {
 #define SBUFSZ (2 * 32 + 9)
   char s[SBUFSZ];
@@ -497,7 +497,7 @@ report_spi (FILE *fd, const u_int8_t *buf, size_t sz, int index)
   if (j)
     {
       s[j] = '\0';
-      fprintf (fd, "SPI %d: %s\n", index, s);
+      fprintf (fd, "SPI %d: %s\n", spi, s);
     }
 }