CVS commit: src/sys/kern

[Masao Uebayashi]

Module Name:    src
Committed By:   uebayasi
Date:           Sat Apr 19 23:00:28 UTC 2014

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

Log Message:
copyinargs: Shorten a local var name.


To generate a diff of this commit:
cvs rdiff -u -r1.404 -r1.405 src/sys/kern/kern_exec.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_exec.c
diff -u src/sys/kern/kern_exec.c:1.404 src/sys/kern/kern_exec.c:1.405
--- src/sys/kern/kern_exec.c:1.404	Sat Apr 19 22:59:08 2014
+++ src/sys/kern/kern_exec.c	Sat Apr 19 23:00:27 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_exec.c,v 1.404 2014/04/19 22:59:08 uebayasi Exp $	*/
+/*	$NetBSD: kern_exec.c,v 1.405 2014/04/19 23:00:27 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.404 2014/04/19 22:59:08 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.405 2014/04/19 23:00:27 uebayasi Exp $");
 
 #include "opt_exec.h"
 #include "opt_execfmt.h"
@@ -1458,31 +1458,30 @@ copyinargs(struct execve_data * restrict
 
 	/* copy the fake args list, if there's one, freeing it as we go */
 	if (epp->ep_flags & EXEC_HASARGL) {
-		struct exec_fakearg	*tmpfap = epp->ep_fa;
+		struct exec_fakearg	*fa = epp->ep_fa;
 
-		while (tmpfap->fa_arg != NULL) {
+		while (fa->fa_arg != NULL) {
 			const size_t maxlen = ARG_MAX - (dp - data->ed_argp);
 			size_t len;
 
-			len = strlcpy(dp, tmpfap->fa_arg, maxlen);
+			len = strlcpy(dp, fa->fa_arg, maxlen);
 			/* Count NUL into len. */
 			if (len < maxlen)
 				len++;
 			else {
-				while (tmpfap->fa_arg != NULL) {
-					kmem_free(tmpfap->fa_arg,
-					    tmpfap->fa_len);
-					tmpfap++;
+				while (fa->fa_arg != NULL) {
+					kmem_free(fa->fa_arg, fa->fa_len);
+					fa++;
 				}
 				kmem_free(epp->ep_fa, epp->ep_fa_len);
 				epp->ep_flags &= ~EXEC_HASARGL;
 				return E2BIG;
 			}
-			ktrexecarg(tmpfap->fa_arg, len - 1);
+			ktrexecarg(fa->fa_arg, len - 1);
 			dp += len;
 
-			kmem_free(tmpfap->fa_arg, tmpfap->fa_len);
-			tmpfap++;
+			kmem_free(fa->fa_arg, fa->fa_len);
+			fa++;
 			data->ed_argc++;
 		}
 		kmem_free(epp->ep_fa, epp->ep_fa_len);