Replace more uses of 'cnt' by 'n'.

[pspp] / tests / libpspp / range-tower-test.c

diff --git a/tests/libpspp/range-tower-test.c b/tests/libpspp/range-tower-test.c
index f5da5e230e85856da63f28d81eda791170faa9e1..32b5efffe74e173a3b9d5bb88840ed54b1f259b4 100644 (file)
--- a/tests/libpspp/range-tower-test.c
+++ b/tests/libpspp/range-tower-test.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -130,7 +130,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;
@@ -150,7 +150,7 @@ prev_region (unsigned int pattern, unsigned int offset,
    or ULONG_MAX if none is found. */
 static unsigned long int
 next_1bit (unsigned int pattern, unsigned int offset,
-           unsigned int pattern_offset)
+           unsigned long int pattern_offset)
 {
   for (; offset < UINT_BIT; offset++)
     if (pattern & (1u << offset))
@@ -165,7 +165,7 @@ print_structure (const struct abt_node *node_)
 
   if (node_ == NULL)
     return;
-  node = abt_data (node_, struct range_tower_node, abt_node);
+  node = ABT_DATA (node_, struct range_tower_node, abt_node);
   printf ("%lu+%lu/%d", node->n_zeros, node->n_ones, node->abt_node.level);
   if (node->abt_node.down[0] || node->abt_node.down[1])
     {
@@ -346,16 +346,16 @@ make_pattern (unsigned int pattern, unsigned long int offset)
   return rt;
 }
 
-/* Returns an unsigned int with bits OFS...OFS+CNT (exclusive)
+/* Returns an unsigned int with bits OFS...OFS+N (exclusive)
    tower to 1, other bits tower 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;
 }
 \f
 /* Tests setting all possible ranges of 1s into all possible range sets (up to