X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=tests%2Flibpspp%2Frange-set-test.c;h=254ad060d1c607280f288b0b04c5a334e2e5ff91;hb=fa709bc6e88c78308254a7536c3d100df4ded67a;hp=7ae8c21e87855de944f6938ee823d919658d66bc;hpb=7d683abd904f855c4dc5614a326dc6b2146853c9;p=pspp diff --git a/tests/libpspp/range-set-test.c b/tests/libpspp/range-set-test.c index 7ae8c21e87..254ad060d1 100644 --- a/tests/libpspp/range-set-test.c +++ b/tests/libpspp/range-set-test.c @@ -128,7 +128,7 @@ prev_region (unsigned int pattern, unsigned int offset, unsigned int i; assert (offset <= UINT_BIT); - for (i = offset; i-- > 0; ) + for (i = offset; i-- > 0;) if (pattern & (1u << i)) { *start = i; @@ -257,16 +257,16 @@ make_pattern (unsigned int pattern) return rs; } -/* Returns an unsigned int with bits OFS...OFS+CNT (exclusive) +/* Returns an unsigned int with bits OFS...OFS+N (exclusive) set to 1, other bits set to 0. */ static unsigned int -bit_range (unsigned int ofs, unsigned int cnt) +bit_range (unsigned int ofs, unsigned int n) { assert (ofs < UINT_BIT); - assert (cnt <= UINT_BIT); - assert (ofs + cnt <= UINT_BIT); + assert (n <= UINT_BIT); + assert (ofs + n <= UINT_BIT); - return cnt < UINT_BIT ? ((1u << cnt) - 1) << ofs : UINT_MAX; + return n < UINT_BIT ? ((1u << n) - 1) << ofs : UINT_MAX; } /* Tests inserting all possible patterns into all possible range