Avoid passing some more `retval's.

3 files changed, 20 insertions, 25 deletions

diff --git a/sys/i386/i386/sys_machdep.c b/sys/i386/i386/sys_machdep.c
index 3c78a70..2cf454d 100644
--- a/sys/i386/i386/sys_machdep.c
+++ b/sys/i386/i386/sys_machdep.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)sys_machdep.c	5.5 (Berkeley) 1/19/91
- *	$Id: sys_machdep.c,v 1.27 1997/10/10 12:42:54 peter Exp $
+ *	$Id: sys_machdep.c,v 1.28 1997/11/06 19:28:05 phk Exp $
  *
  */
 
@@ -66,12 +66,12 @@
 
 void set_user_ldt	__P((struct pcb *pcb));
 #ifdef USER_LDT
-static int i386_get_ldt	__P((struct proc *, char *, int *));
-static int i386_set_ldt	__P((struct proc *, char *, int *));
+static int i386_get_ldt	__P((struct proc *, char *));
+static int i386_set_ldt	__P((struct proc *, char *));
 #endif
 #ifdef VM86
-static int i386_get_ioperm	__P((struct proc *, char *, int *));
-static int i386_set_ioperm	__P((struct proc *, char *, int *));
+static int i386_get_ioperm	__P((struct proc *, char *));
+static int i386_set_ioperm	__P((struct proc *, char *));
 int i386_extend_pcb	__P((struct proc *));
 #endif
 
@@ -92,22 +92,22 @@ sysarch(p, uap)
 	switch(uap->op) {
 #ifdef	USER_LDT
 	case I386_GET_LDT:
-		error = i386_get_ldt(p, uap->parms, p->p_retval);
+		error = i386_get_ldt(p, uap->parms);
 		break;
 
 	case I386_SET_LDT:
-		error = i386_set_ldt(p, uap->parms, p->p_retval);
+		error = i386_set_ldt(p, uap->parms);
 		break;
 #endif
 #ifdef VM86
 	case I386_GET_IOPERM:
-		error = i386_get_ioperm(p, uap->parms, p->p_retval);
+		error = i386_get_ioperm(p, uap->parms);
 		break;
 	case I386_SET_IOPERM:
-		error = i386_set_ioperm(p, uap->parms, p->p_retval);
+		error = i386_set_ioperm(p, uap->parms);
 		break;
 	case I386_VM86:
-		error = vm86_sysarch(p, uap->parms, p->p_retval);
+		error = vm86_sysarch(p, uap->parms);
 		break;
 #endif
 	default:
@@ -176,10 +176,9 @@ struct i386_ioperm_args {
 };
 
 static int
-i386_set_ioperm(p, args, retval)
+i386_set_ioperm(p, args)
 	struct proc *p;
 	char *args;
-	int *retval;
 {
 	int i, error = 0;
 	struct i386_ioperm_args ua;
@@ -216,10 +215,9 @@ i386_set_ioperm(p, args, retval)
 }
 
 static int
-i386_get_ioperm(p, args, retval)
+i386_get_ioperm(p, args)
 	struct proc *p;
 	char *args;
-	int *retval;
 {
 	int i, state, error = 0;
 	struct i386_ioperm_args ua;
@@ -273,10 +271,9 @@ struct i386_get_ldt_args {
 };
 
 static int
-i386_get_ldt(p, args, retval)
+i386_get_ldt(p, args)
 	struct proc *p;
 	char *args;
-	int *retval;
 {
 	int error = 0;
 	struct pcb *pcb = &p->p_addr->u_pcb;
@@ -316,7 +313,7 @@ i386_get_ldt(p, args, retval)
 
 	error = copyout(lp, uap->desc, num * sizeof(union descriptor));
 	if (!error)
-		*retval = num;
+		p->p_retval[0] = num;
 
 	splx(s);
 	return(error);
@@ -329,10 +326,9 @@ struct i386_set_ldt_args {
 };
 
 static int
-i386_set_ldt(p, args, retval)
+i386_set_ldt(p, args)
 	struct proc *p;
 	char *args;
-	int *retval;
 {
 	int error = 0, i, n;
  	int largest_ld;
@@ -452,7 +448,7 @@ i386_set_ldt(p, args, retval)
  		 &((union descriptor *)(pcb->pcb_ldt))[uap->start],
  		uap->num * sizeof(union descriptor));
  	if (!error)
-  		*retval = uap->start;
+  		p->p_retval[0] = uap->start;
 
 	splx(s);
 	return(error);
diff --git a/sys/i386/i386/vm86.c b/sys/i386/i386/vm86.c
index c8deb46..4d7fb91 100644
--- a/sys/i386/i386/vm86.c
+++ b/sys/i386/i386/vm86.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: vm86.c,v 1.3 1997/09/01 01:12:53 bde Exp $
+ *	$Id: vm86.c,v 1.4 1997/10/10 12:42:50 peter Exp $
  */
 
 #include <sys/param.h>
@@ -322,10 +322,9 @@ vm86_emulate(vmf)
 }
 
 int
-vm86_sysarch(p, args, retval)
+vm86_sysarch(p, args)
 	struct proc *p;
 	char *args;
-	int *retval;
 {
 	int error = 0;
 	struct i386_vm86_args ua;
diff --git a/sys/i386/include/vm86.h b/sys/i386/include/vm86.h
index 5b3eec3..127c951 100644
--- a/sys/i386/include/vm86.h
+++ b/sys/i386/include/vm86.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: vm86.h,v 1.2 1997/08/20 19:57:24 jlemon Exp $
+ *	$Id: vm86.h,v 1.3 1997/08/28 14:36:56 jlemon Exp $
  */
 
 #ifndef _MACHINE_VM86_H_
@@ -107,6 +107,6 @@ struct vm86frame {
 
 struct proc;
 extern	int vm86_emulate __P((struct vm86frame *));
-extern	int vm86_sysarch __P((struct proc *, char *, int *));
+extern	int vm86_sysarch __P((struct proc *, char *));
 
 #endif /* _MACHINE_VM86_H_ */