[src/trunk]: src/sys/compat/sunos Fix shadow warnings.

[tsutsui <tsutsui%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6f7a0bb3171a
branches:  trunk
changeset: 581560:6f7a0bb3171a
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Thu Jun 02 15:22:03 2005 +0000

description:
Fix shadow warnings.

diffstat:

 sys/compat/sunos/sunos_ioctl.c |  20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diffs (65 lines):

diff -r 9cd28b4a77f1 -r 6f7a0bb3171a sys/compat/sunos/sunos_ioctl.c
--- a/sys/compat/sunos/sunos_ioctl.c    Thu Jun 02 15:21:35 2005 +0000
+++ b/sys/compat/sunos/sunos_ioctl.c    Thu Jun 02 15:22:03 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sunos_ioctl.c,v 1.49 2004/06/01 10:27:39 pk Exp $      */
+/*     $NetBSD: sunos_ioctl.c,v 1.50 2005/06/02 15:22:03 tsutsui Exp $ */
 
 /*
  * Copyright (c) 1993 Markus Wild.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunos_ioctl.c,v 1.49 2004/06/01 10:27:39 pk Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunos_ioctl.c,v 1.50 2005/06/02 15:22:03 tsutsui Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_execfmt.h"
@@ -614,7 +614,7 @@
  * Pseudo-tty ioctl translations.
  */
        case _IOW('t', 32, int): {      /* TIOCTCNTL */
-               int error, on;
+               int on;
 
                error = copyin (SCARG(uap, data), (caddr_t)&on, sizeof (on));
                if (error)
@@ -623,7 +623,7 @@
                break;
        }
        case _IOW('t', 33, int): {      /* TIOCSIGNAL */
-               int error, sig;
+               int sig;
 
                error = copyin (SCARG(uap, data), (caddr_t)&sig, sizeof (sig));
                if (error)
@@ -709,22 +709,22 @@
 
        case _IOWR('i', 20, struct ifconf):     /* SIOCGIFCONF */
            {
-               struct ifconf ifconf;
+               struct ifconf ifc;
 
                /*
                 * XXX: two more problems
                 * 1. our sockaddr's are variable length, not always sizeof(sockaddr)
                 * 2. this returns a name per protocol, ie. it returns two "lo0"'s
                 */
-               error = copyin (SCARG(uap, data), (caddr_t)&ifconf,
-                   sizeof (ifconf));
+               error = copyin (SCARG(uap, data), (caddr_t)&ifc,
+                   sizeof (ifc));
                if (error)
                        break;
-               error = (*ctl)(fp, OSIOCGIFCONF, (caddr_t)&ifconf, p);
+               error = (*ctl)(fp, OSIOCGIFCONF, (caddr_t)&ifc, p);
                if (error)
                        break;
-               error = copyout ((caddr_t)&ifconf, SCARG(uap, data),
-                   sizeof (ifconf));
+               error = copyout ((caddr_t)&ifc, SCARG(uap, data),
+                   sizeof (ifc));
                break;
            }