Module Name: src
Committed By: chs
Date: Sun Dec 14 23:49:28 UTC 2014
Modified Files:
src/sys/kern: kern_exec.c
src/sys/sys: exec.h
Log Message:
remove ep_name, change the last reference to use ep_kname instead.
To generate a diff of this commit:
cvs rdiff -u -r1.411 -r1.412 src/sys/kern/kern_exec.c
cvs rdiff -u -r1.147 -r1.148 src/sys/sys/exec.h
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.411 src/sys/kern/kern_exec.c:1.412
--- src/sys/kern/kern_exec.c:1.411 Sun Dec 14 21:35:24 2014
+++ src/sys/kern/kern_exec.c Sun Dec 14 23:49:28 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_exec.c,v 1.411 2014/12/14 21:35:24 christos Exp $ */
+/* $NetBSD: kern_exec.c,v 1.412 2014/12/14 23:49:28 chs 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.411 2014/12/14 21:35:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.412 2014/12/14 23:49:28 chs Exp $");
#include "opt_exec.h"
#include "opt_execfmt.h"
@@ -663,7 +663,6 @@ execve_loadvm(struct lwp *l, const char
/*
* initialize the fields of the exec package.
*/
- epp->ep_name = path;
epp->ep_kname = data->ed_pathstring;
epp->ep_resolvedname = data->ed_resolvedpathbuf;
epp->ep_hdr = kmem_alloc(exec_maxhdrsz, KM_SLEEP);
@@ -1235,7 +1234,7 @@ execve_runproc(struct lwp *l, struct exe
kmem_free(epp->ep_hdr, epp->ep_hdrlen);
- SDT_PROBE(proc,,,exec_success, epp->ep_name, 0, 0, 0, 0);
+ SDT_PROBE(proc,,,exec_success, epp->ep_kname, 0, 0, 0, 0);
emulexec(l, epp);
Index: src/sys/sys/exec.h
diff -u src/sys/sys/exec.h:1.147 src/sys/sys/exec.h:1.148
--- src/sys/sys/exec.h:1.147 Sun Dec 14 21:35:24 2014
+++ src/sys/sys/exec.h Sun Dec 14 23:49:28 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: exec.h,v 1.147 2014/12/14 21:35:24 christos Exp $ */
+/* $NetBSD: exec.h,v 1.148 2014/12/14 23:49:28 chs Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -187,7 +187,6 @@ struct exec_fakearg {
};
struct exec_package {
- const char *ep_name; /* file's name */
const char *ep_kname; /* kernel-side copy of file's name */
char *ep_resolvedname; /* fully resolved path from namei */
void *ep_hdr; /* file's exec header */