svn commit: r312109 - head/tests/sys/vfs

[Ngie Cooper]

Author: ngie
Date: Sat Jan 14 04:00:26 2017
New Revision: 312109
URL: https://svnweb.freebsd.org/changeset/base/312109

Log:
  Bump WARNS up to 6 again
  
  Has not been tested (can't be after r312103 without cem's hacks
  to atf/kyua)!

Modified:
  head/tests/sys/vfs/Makefile
  head/tests/sys/vfs/lookup_cap_dotdot.c

Modified: head/tests/sys/vfs/Makefile
==============================================================================
--- head/tests/sys/vfs/Makefile	Sat Jan 14 03:54:23 2017	(r312108)
+++ head/tests/sys/vfs/Makefile	Sat Jan 14 04:00:26 2017	(r312109)
@@ -9,4 +9,6 @@ CFLAGS.lookup_cap_dotdot.c+=	-I${SRCTOP}
 
 PLAIN_TESTS_SH+=	trailing_slash
 
+WARNS?=		6
+
 .include <bsd.test.mk>

Modified: head/tests/sys/vfs/lookup_cap_dotdot.c
==============================================================================
--- head/tests/sys/vfs/lookup_cap_dotdot.c	Sat Jan 14 03:54:23 2017	(r312108)
+++ head/tests/sys/vfs/lookup_cap_dotdot.c	Sat Jan 14 04:00:26 2017	(r312109)
@@ -43,11 +43,11 @@ static int dirfd = -1;
 static char *abspath;
 
 static void
-touchat(int dirfd, const char *name)
+touchat(int _dirfd, const char *name)
 {
 	int fd;
 
-	ATF_REQUIRE((fd = openat(dirfd, name, O_CREAT | O_TRUNC | O_WRONLY,
+	ATF_REQUIRE((fd = openat(_dirfd, name, O_CREAT | O_TRUNC | O_WRONLY,
 	    0777)) >= 0);
 	ATF_REQUIRE(close(fd) == 0);
 }
@@ -117,7 +117,6 @@ ATF_TC_HEAD(lookup_cap_dotdot__basic, tc
 ATF_TC_BODY(lookup_cap_dotdot__basic, tc)
 {
 	cap_rights_t rights;
-	int fd;
 
 	check_capsicum();
 	prepare_dotdot_tests();
@@ -141,7 +140,6 @@ ATF_TC_HEAD(lookup_cap_dotdot__advanced,
 ATF_TC_BODY(lookup_cap_dotdot__advanced, tc)
 {
 	cap_rights_t rights;
-	int fd;
 
 	check_capsicum();
 	prepare_dotdot_tests();
@@ -220,7 +218,6 @@ ATF_TC_HEAD(lookup_cap_dotdot__negative,
 ATF_TC_BODY(lookup_cap_dotdot__negative, tc)
 {
 	cap_rights_t rights;
-	int fd;
 
 	check_capsicum();
 	prepare_dotdot_tests();