From owner-svn-src-all@freebsd.org  Wed Jan 27 19:55:04 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4A55FA70285;
 Wed, 27 Jan 2016 19:55:04 +0000 (UTC) (envelope-from mjg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1E59913E3;
 Wed, 27 Jan 2016 19:55:04 +0000 (UTC) (envelope-from mjg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0RJt37e073846;
 Wed, 27 Jan 2016 19:55:03 GMT (envelope-from mjg@FreeBSD.org)
Received: (from mjg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0RJt3Jk073845;
 Wed, 27 Jan 2016 19:55:03 GMT (envelope-from mjg@FreeBSD.org)
Message-Id: <201601271955.u0RJt3Jk073845@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org
 using -f
From: Mateusz Guzik <mjg@FreeBSD.org>
Date: Wed, 27 Jan 2016 19:55:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r294934 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 27 Jan 2016 19:55:04 -0000

Author: mjg
Date: Wed Jan 27 19:55:02 2016
New Revision: 294934
URL: https://svnweb.freebsd.org/changeset/base/294934

Log:
  ktrace: tidy up ktrstruct
  
  - minor style fixes
  - avoid doing strlen twice [1]
  
  PR:		206648
  Submitted by:	C Turt <ecturt gmail.com> (original version) [1]

Modified:
  head/sys/kern/kern_ktrace.c

Modified: head/sys/kern/kern_ktrace.c
==============================================================================
--- head/sys/kern/kern_ktrace.c	Wed Jan 27 19:11:11 2016	(r294933)
+++ head/sys/kern/kern_ktrace.c	Wed Jan 27 19:55:02 2016	(r294934)
@@ -757,15 +757,16 @@ ktrstruct(name, data, datalen)
 	size_t datalen;
 {
 	struct ktr_request *req;
-	char *buf = NULL;
-	size_t buflen;
+	char *buf;
+	size_t buflen, namelen;
 
-	if (!data)
+	if (data == NULL)
 		datalen = 0;
-	buflen = strlen(name) + 1 + datalen;
+	namelen = strlen(name) + 1;
+	buflen = namelen + datalen;
 	buf = malloc(buflen, M_KTRACE, M_WAITOK);
 	strcpy(buf, name);
-	bcopy(data, buf + strlen(name) + 1, datalen);
+	bcopy(data, buf + namelen, datalen);
 	if ((req = ktr_getrequest(KTR_STRUCT)) == NULL) {
 		free(buf, M_KTRACE);
 		return;