Better variables naming in expand_name() to be more consistent with coredump().

Obtained from:	WHEEL Systems

1 files changed, 16 insertions, 16 deletions

diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index f7a2d31..97a4858 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -3045,23 +3045,23 @@ SYSCTL_STRING(_kern, OID_AUTO, corefile, CTLFLAG_RW, corefilename,
  * This is controlled by the sysctl variable kern.corefile (see above).
  */
 static char *
-expand_name(const char *name, uid_t uid, pid_t pid, struct thread *td,
+expand_name(const char *comm, uid_t uid, pid_t pid, struct thread *td,
     int compress)
 {
 	struct sbuf sb;
 	const char *format;
-	char *temp;
+	char *name;
 	size_t i;
 	int indexpos;
 	char *hostname;
 
 	hostname = NULL;
 	format = corefilename;
-	temp = malloc(MAXPATHLEN, M_TEMP, M_NOWAIT | M_ZERO);
-	if (temp == NULL)
+	name = malloc(MAXPATHLEN, M_TEMP, M_NOWAIT | M_ZERO);
+	if (name == NULL)
 		return (NULL);
 	indexpos = -1;
-	(void)sbuf_new(&sb, temp, MAXPATHLEN, SBUF_FIXEDLEN);
+	(void)sbuf_new(&sb, name, MAXPATHLEN, SBUF_FIXEDLEN);
 	for (i = 0; format[i]; i++) {
 		switch (format[i]) {
 		case '%':	/* Format character */
@@ -3079,7 +3079,7 @@ expand_name(const char *name, uid_t uid, pid_t pid, struct thread *td,
 						    "pid %ld (%s), uid (%lu): "
 						    "unable to alloc memory "
 						    "for corefile hostname\n",
-						    (long)pid, name,
+						    (long)pid, comm,
 						    (u_long)uid);
                                                 goto nomem;
                                         }
@@ -3093,7 +3093,7 @@ expand_name(const char *name, uid_t uid, pid_t pid, struct thread *td,
 				indexpos = sbuf_len(&sb) - 1;
 				break;
 			case 'N':	/* process name */
-				sbuf_printf(&sb, "%s", name);
+				sbuf_printf(&sb, "%s", comm);
 				break;
 			case 'P':	/* process id */
 				sbuf_printf(&sb, "%u", pid);
@@ -3119,10 +3119,10 @@ expand_name(const char *name, uid_t uid, pid_t pid, struct thread *td,
 #endif
 	if (sbuf_error(&sb) != 0) {
 		log(LOG_ERR, "pid %ld (%s), uid (%lu): corename is too "
-		    "long\n", (long)pid, name, (u_long)uid);
+		    "long\n", (long)pid, comm, (u_long)uid);
 nomem:
 		sbuf_delete(&sb);
-		free(temp, M_TEMP);
+		free(name, M_TEMP);
 		return (NULL);
 	}
 	sbuf_finish(&sb);
@@ -3145,9 +3145,9 @@ nomem:
 			oflags = VN_OPEN_NOCAPCHECK;
 
 		for (n = 0; n < num_cores; n++) {
-			temp[indexpos] = '0' + n;
+			name[indexpos] = '0' + n;
 			NDINIT(&nd, LOOKUP, NOFOLLOW, UIO_SYSSPACE,
-			    temp, td);
+			    name, td);
 			error = vn_open_cred(&nd, &flags, cmode, oflags,
 			    td->td_ucred, NULL);
 			if (error) {
@@ -3156,8 +3156,8 @@ nomem:
 				log(LOG_ERR,
 				    "pid %d (%s), uid (%u):  Path `%s' failed "
                                     "on initial open test, error = %d\n",
-				    pid, name, uid, temp, error);
-				free(temp, M_TEMP);
+				    pid, comm, uid, name, error);
+				free(name, M_TEMP);
 				return (NULL);
 			}
 			NDFREE(&nd, NDF_ONLY_PNBUF);
@@ -3168,14 +3168,14 @@ nomem:
 				    "pid %d (%s), uid (%u):  Path `%s' failed "
                                     "on close after initial open test, "
                                     "error = %d\n",
-				    pid, name, uid, temp, error);
-				free(temp, M_TEMP);
+				    pid, comm, uid, name, error);
+				free(name, M_TEMP);
 				return (NULL);
 			}
 			break;
 		}
 	}
-	return (temp);
+	return (name);
 }
 
 /*