[src/trunk]: src/sys/compat/ultrix avoid shadow warnings

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

details:   https://anonhg.NetBSD.org/src/rev/39f1f241a52b
branches:  trunk
changeset: 581421:39f1f241a52b
user:      drochner <drochner%NetBSD.org@localhost>
date:      Wed Jun 01 15:29:41 2005 +0000

description:
avoid shadow warnings

diffstat:

 sys/compat/ultrix/ultrix_ioctl.c |  16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diffs (61 lines):

diff -r 0ea821c3eb14 -r 39f1f241a52b sys/compat/ultrix/ultrix_ioctl.c
--- a/sys/compat/ultrix/ultrix_ioctl.c  Wed Jun 01 15:28:56 2005 +0000
+++ b/sys/compat/ultrix/ultrix_ioctl.c  Wed Jun 01 15:29:41 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ultrix_ioctl.c,v 1.26 2005/02/26 23:10:22 perry Exp $ */
+/*     $NetBSD: ultrix_ioctl.c,v 1.27 2005/06/01 15:29:41 drochner Exp $ */
 /*     from : NetBSD: sunos_ioctl.c,v 1.21 1995/10/07 06:27:31 mycroft Exp */
 
 /*
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ultrix_ioctl.c,v 1.26 2005/02/26 23:10:22 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ultrix_ioctl.c,v 1.27 2005/06/01 15:29:41 drochner Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_compat_ultrix.h"
@@ -608,7 +608,7 @@
  * Pseudo-tty ioctl translations.
  */
        case _IOW('t', 32, int): {      /* TIOCTCNTL */
-               int error, on;
+               int on;
 
                error = copyin(SCARG(uap, data), &on, sizeof (on));
                if (error != 0)
@@ -616,7 +616,7 @@
                return (*ctl)(fp, TIOCUCNTL, &on, p);
        }
        case _IOW('t', 33, int): {      /* TIOCSIGNAL */
-               int error, sig;
+               int sig;
 
                error = copyin(SCARG(uap, data), &sig, sizeof (sig));
                if (error != 0)
@@ -692,20 +692,20 @@
 
        case _IOWR('i', 20, struct ifconf):     /* SIOCGIFCONF */
            {
-               struct ifconf ifconf;
+               struct ifconf ifconfarg;
 
                /*
                 * 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), &ifconf, sizeof (ifconf));
+               error = copyin(SCARG(uap, data), &ifconfarg, sizeof (ifconfarg));
                if (error)
                        return error;
-               error = (*ctl)(fp, OSIOCGIFCONF, &ifconf, p);
+               error = (*ctl)(fp, OSIOCGIFCONF, &ifconfarg, p);
                if (error)
                        return error;
-               return copyout(&ifconf, SCARG(uap, data), sizeof (ifconf));
+               return copyout(&ifconfarg, SCARG(uap, data), sizeof (ifconfarg));
            }