Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 11 Aug 2011 15:52:07 +0000 (UTC)
From:      Jonathan Anderson <jonathan@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r224784 - head/tools/regression/security/cap_test
Message-ID:  <201108111552.p7BFq73l099065@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jonathan
Date: Thu Aug 11 15:52:06 2011
New Revision: 224784
URL: http://svn.freebsd.org/changeset/base/224784

Log:
  Use the right printf() format string without a cast to maxint_t.
  
  As per kib's suggestion, we also change test_count from a size_t to an int;
  its value at the moment is 4, and we only expect it to go up to 7.
  
  Approved by: re (kib), mentor (rwatson)
  Sponsored by: Google Inc

Modified:
  head/tools/regression/security/cap_test/cap_test.c

Modified: head/tools/regression/security/cap_test/cap_test.c
==============================================================================
--- head/tools/regression/security/cap_test/cap_test.c	Thu Aug 11 15:22:46 2011	(r224783)
+++ head/tools/regression/security/cap_test/cap_test.c	Thu Aug 11 15:52:06 2011	(r224784)
@@ -51,7 +51,7 @@ struct test all_tests[] = {
 	TEST_INIT(fcntl),
 	TEST_INIT(sysctl),
 };
-size_t test_count = sizeof(all_tests) / sizeof(struct test);
+int test_count = sizeof(all_tests) / sizeof(struct test);
 
 int
 main(int argc, char *argv[])
@@ -61,9 +61,9 @@ main(int argc, char *argv[])
 	 * If no tests have been specified at the command line, run them all.
 	 */
 	if (argc == 1) {
-		printf("1..%ju\n", (uintmax_t)test_count);
+		printf("1..%d\n", test_count);
 
-		for (size_t i = 0; i < test_count; i++)
+		for (int i = 0; i < test_count; i++)
 			execute(i + 1, all_tests + i);
 		return (0);
 	}
@@ -75,7 +75,7 @@ main(int argc, char *argv[])
 	for (int i = 1; i < argc; i++)
 	{
 		int found = 0;
-		for (size_t j = 0; j < test_count; j++) {
+		for (int j = 0; j < test_count; j++) {
 			if (strncmp(argv[i], all_tests[j].t_name,
 			    strlen(argv[i])) == 0) {
 				found = 1;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201108111552.p7BFq73l099065>