svn commit: r292819 - head/tests/sys/aio

Garrett Cooper ngie at FreeBSD.org
Mon Dec 28 02:21:37 UTC 2015


Author: ngie
Date: Mon Dec 28 02:21:36 2015
New Revision: 292819
URL: https://svnweb.freebsd.org/changeset/base/292819

Log:
  - Fix an improperly sized buffer for `pathname` [1]
  - Fix a -Wunused-but-set-variable warning [2]
  
  MFC after: 1 week
  Reported by: cppcheck [1], gcc 4.9 [2]
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/tests/sys/aio/lio_kqueue_test.c

Modified: head/tests/sys/aio/lio_kqueue_test.c
==============================================================================
--- head/tests/sys/aio/lio_kqueue_test.c	Mon Dec 28 02:18:22 2015	(r292818)
+++ head/tests/sys/aio/lio_kqueue_test.c	Mon Dec 28 02:21:36 2015	(r292819)
@@ -62,7 +62,7 @@ main(int argc, char *argv[])
 {
 	int fd;
 	struct aiocb *iocb[MAX_IOCBS];
-	struct aiocb **lio[LIO_MAX], **lio_element, **kq_lio;
+	struct aiocb **lio[LIO_MAX], **kq_lio;
 	int i, result, run, error, j, k;
 	char buffer[32768];
 	int kq;
@@ -70,7 +70,7 @@ main(int argc, char *argv[])
 	struct timespec ts;
 	struct sigevent sig;
 	time_t time1, time2;
-	char *file, pathname[sizeof(PATH_TEMPLATE)-1];
+	char *file, pathname[sizeof(PATH_TEMPLATE)];
 	int tmp_file = 0, failed = 0;
 
 	PLAIN_REQUIRE_KERNEL_MODULE("aio", 0);
@@ -104,7 +104,6 @@ main(int argc, char *argv[])
 			    malloc(sizeof(struct aiocb *) * MAX_IOCBS/LIO_MAX);
 			for (i = 0; i < MAX_IOCBS / LIO_MAX; i++) {
 				k = (MAX_IOCBS / LIO_MAX * j) + i;
-				lio_element = lio[j];
 				lio[j][i] = iocb[k] =
 				    calloc(1, sizeof(struct aiocb));
 				iocb[k]->aio_nbytes = sizeof(buffer);


More information about the svn-src-head mailing list