Module Name:    src
Committed By:   matt
Date:           Sat Mar  5 01:52:18 UTC 2011

Modified Files:
        src/sys/kern: kern_proc.c

Log Message:
Simplify copyin_psstrings a bit.


To generate a diff of this commit:
cvs rdiff -u -r1.172 -r1.173 src/sys/kern/kern_proc.c

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

Modified files:

Index: src/sys/kern/kern_proc.c
diff -u src/sys/kern/kern_proc.c:1.172 src/sys/kern/kern_proc.c:1.173
--- src/sys/kern/kern_proc.c:1.172	Fri Mar  4 22:25:31 2011
+++ src/sys/kern/kern_proc.c	Sat Mar  5 01:52:18 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_proc.c,v 1.172 2011/03/04 22:25:31 joerg Exp $	*/
+/*	$NetBSD: kern_proc.c,v 1.173 2011/03/05 01:52:18 matt Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.172 2011/03/04 22:25:31 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.173 2011/03/05 01:52:18 matt Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_kstack.h"
@@ -1836,13 +1836,12 @@
 int
 copyin_psstrings(struct proc *p, struct ps_strings *arginfo)
 {
-	int error;
 
 #ifdef COMPAT_NETBSD32
 	if (p->p_flag & PK_32) {
 		struct ps_strings32 arginfo32;
 
-		error = copyin_proc(p, (void *)p->p_psstrp, &arginfo32,
+		int error = copyin_proc(p, (void *)p->p_psstrp, &arginfo32,
 		    sizeof(arginfo32));
 		if (error)
 			return error;
@@ -1850,15 +1849,10 @@
 		arginfo->ps_nargvstr = arginfo32.ps_nargvstr;
 		arginfo->ps_envstr = (void *)(uintptr_t)arginfo32.ps_envstr;
 		arginfo->ps_nenvstr = arginfo32.ps_nenvstr;
-	} else
-#endif
-	{
-		error = copyin_proc(p, (void *)p->p_psstrp, arginfo,
-		    sizeof(*arginfo));
-		if (error)
-			return error;
+		return 0;
 	}
-	return 0;
+#endif
+	return copyin_proc(p, (void *)p->p_psstrp, arginfo, sizeof(*arginfo));
 }
 
 static int

Reply via email to