X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Flibpspp%2Frange-set-test.c;h=254ad060d1c607280f288b0b04c5a334e2e5ff91;hb=4d777aeacfa602840718862c31c9059e3d289eed;hp=9c13de6d082c9b13af715597d75604d56987a5de;hpb=6faf0262cb9bc8d3b0b7b511858a8fb63bc6ea7f;p=pspp

diff --git a/tests/libpspp/range-set-test.c b/tests/libpspp/range-set-test.c
index 9c13de6d08..254ad060d1 100644
--- a/tests/libpspp/range-set-test.c
+++ b/tests/libpspp/range-set-test.c
@@ -38,7 +38,6 @@
 #include <libpspp/compiler.h>
 #include <libpspp/pool.h>
 
-#include "xalloc.h"
 
 /* Exit with a failure code.
    (Place a breakpoint on this function while debugging.) */
@@ -129,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;
@@ -258,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