From 332739d607ffa091aef5d9ebe1bbd0ded4c2e3bf Mon Sep 17 00:00:00 2001
From: phk <phk@FreeBSD.org>
Date: Sun, 22 Sep 1996 18:17:51 +0000
Subject: Remove the extra length field from the utrace entries.  It's
 redundant.

---
 sys/kern/kern_ktrace.c | 14 +++++---------
 sys/sys/ktrace.h       |  8 +-------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c
index 595e4ef..5a96882 100644
--- a/sys/kern/kern_ktrace.c
+++ b/sys/kern/kern_ktrace.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_ktrace.c	8.2 (Berkeley) 9/23/93
- * $Id: kern_ktrace.c,v 1.12 1996/08/04 20:13:07 phk Exp $
+ * $Id: kern_ktrace.c,v 1.13 1996/09/19 19:48:33 phk Exp $
  */
 
 #include "opt_ktrace.h"
@@ -357,7 +357,6 @@ utrace(curp, uap, retval)
 	int *retval;
 {
 #ifdef KTRACE
-	register struct ktr_user *ktp;
 	struct ktr_header *kth;
 	struct proc *p = curproc;	/* XXX */
 	register caddr_t cp;
@@ -366,17 +365,14 @@ utrace(curp, uap, retval)
 		return (0);
 	p->p_traceflag |= KTRFAC_ACTIVE;
 	kth = ktrgetheader(KTR_USER);
-	MALLOC(ktp, struct ktr_user *, sizeof(struct ktr_user) + uap->len,
-		M_KTRACE, M_WAITOK);
-	ktp->len = uap->len;
-	cp = (caddr_t)((char *)ktp + sizeof (struct ktr_user));
+	MALLOC(cp, caddr_t, uap->len, M_KTRACE, M_WAITOK);
 	if (!copyin(uap->addr, cp, uap->len)) {
-		kth->ktr_buf = (caddr_t)ktp;
-		kth->ktr_len = sizeof (struct ktr_user) + uap->len;
+		kth->ktr_buf = cp;
+		kth->ktr_len = uap->len;
 		ktrwrite(p->p_tracep, kth);
 	}
 	FREE(kth, M_KTRACE);
-	FREE(ktp, M_KTRACE);
+	FREE(cp, M_KTRACE);
 	p->p_traceflag &= ~KTRFAC_ACTIVE;
 
 	return (0);
diff --git a/sys/sys/ktrace.h b/sys/sys/ktrace.h
index 15b155a..4736761 100644
--- a/sys/sys/ktrace.h
+++ b/sys/sys/ktrace.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ktrace.h	8.1 (Berkeley) 6/2/93
- * $Id: ktrace.h,v 1.8 1995/12/14 08:32:31 phk Exp $
+ * $Id: ktrace.h,v 1.9 1996/09/19 19:49:08 phk Exp $
  */
 
 #ifndef _SYS_KTRACE_H_
@@ -136,12 +136,6 @@ struct ktr_csw {
  * KTR_USER - data comming from userland
  */
 #define KTR_USER	7
-struct ktr_user {
-	int	len;	/* number of bytes */
-	/*
-	 * followed by data provided by user
-	 */
-};
 
 /*
  * kernel trace points (in p_traceflag)
-- 
cgit v1.1