CVS commit: src/tests/include/sys

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Fri Dec  7 02:28:19 UTC 2012

Modified Files:
        src/tests/include/sys: t_bitops.c

Log Message:
use __BITMAP_TYPE


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/tests/include/sys/t_bitops.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/tests/include/sys/t_bitops.c
diff -u src/tests/include/sys/t_bitops.c:1.15 src/tests/include/sys/t_bitops.c:1.16
--- src/tests/include/sys/t_bitops.c:1.15	Tue Dec  4 01:57:44 2012
+++ src/tests/include/sys/t_bitops.c	Thu Dec  6 21:28:19 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_bitops.c,v 1.15 2012/12/04 06:57:44 jruoho Exp $ */
+/*	$NetBSD: t_bitops.c,v 1.16 2012/12/07 02:28:19 christos Exp $ */
 
 /*-
  * Copyright (c) 2011, 2012 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: t_bitops.c,v 1.15 2012/12/04 06:57:44 jruoho Exp $");
+__RCSID("$NetBSD: t_bitops.c,v 1.16 2012/12/07 02:28:19 christos Exp $");
 
 #include <atf-c.h>
 
@@ -72,8 +72,8 @@ ATF_TC_HEAD(bitmap_basic, tc)
 
 ATF_TC_BODY(bitmap_basic, tc)
 {
-	uint32_t bm[__BITMAP_SIZE(uint32_t, 65536)];
-	__BITMAP_ZERO(bm);
+	__BITMAP_TYPE(, uint32_t, 65536) bm;
+	__BITMAP_ZERO(&bm);
 
 	ATF_REQUIRE(__BITMAP_SIZE(uint32_t, 65536) == 2048);
 
@@ -82,21 +82,21 @@ ATF_TC_BODY(bitmap_basic, tc)
 	ATF_REQUIRE(__BITMAP_MASK(uint32_t) == 31);
 
 	for (size_t i = 0; i < 65536; i += 2)
-		__BITMAP_SET(i, bm);
+		__BITMAP_SET(i, &bm);
 
 	for (size_t i = 0; i < 2048; i++)
-		ATF_REQUIRE(bm[i] == 0x55555555);
+		ATF_REQUIRE(bm._b[i] == 0x55555555);
 
 	for (size_t i = 0; i < 65536; i++)
 		if (i & 1)
-			ATF_REQUIRE(!__BITMAP_ISSET(i, bm));
+			ATF_REQUIRE(!__BITMAP_ISSET(i, &bm));
 		else {
-			ATF_REQUIRE(__BITMAP_ISSET(i, bm));
-			__BITMAP_CLR(i, bm);
+			ATF_REQUIRE(__BITMAP_ISSET(i, &bm));
+			__BITMAP_CLR(i, &bm);
 		}
 
 	for (size_t i = 0; i < 65536; i += 2)
-		ATF_REQUIRE(!__BITMAP_ISSET(i, bm));
+		ATF_REQUIRE(!__BITMAP_ISSET(i, &bm));
 }
 
 ATF_TC(fast_divide32);