Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/compat/ultrix/ultrix_ioctl.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/compat/ultrix/ultrix_ioctl.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- src/sys/compat/ultrix/ultrix_ioctl.c	2005/02/26 23:10:22	1.26
+++ src/sys/compat/ultrix/ultrix_ioctl.c	2005/06/01 15:29:41	1.27
@@ -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 @@ ultrix_sys_ioctl(struct lwp *l, void *v,
  * 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 @@ ultrix_sys_ioctl(struct lwp *l, void *v,
 		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 @@ ultrix_sys_ioctl(struct lwp *l, void *v,
 
 	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));
 	    }