svn commit: r294934 - head/sys/kern

Mateusz Guzik mjg at FreeBSD.org
Wed Jan 27 19:55:04 UTC 2016


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;


More information about the svn-src-all mailing list