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

[pspp] / src / libpspp / float-format.c

diff --git a/src/libpspp/float-format.c b/src/libpspp/float-format.c
index 623d299ca6e901c49e86fa22a7bacc7c52061705..ee2d1228aa1bb09a076550d69dacfe8c1e414084 100644 (file)
--- a/src/libpspp/float-format.c
+++ b/src/libpspp/float-format.c
@@ -167,22 +167,22 @@ float_identify (double expected_value, const void *number, size_t length,
       FLOAT_Z_SHORT,
       FLOAT_Z_LONG,
     };
-  const size_t candidate_cnt = sizeof candidates / sizeof *candidates;
+  const size_t n_candidates = sizeof candidates / sizeof *candidates;
 
   enum float_format *p;
-  int match_cnt;
+  int n_matches;
 
-  match_cnt = 0;
-  for (p = candidates; p < candidates + candidate_cnt; p++)
+  n_matches = 0;
+  for (p = candidates; p < candidates + n_candidates; p++)
     if (float_get_size (*p) == length)
       {
         char tmp[8];
         assert (sizeof tmp >= float_get_size (*p));
         float_convert (FLOAT_NATIVE_DOUBLE, &expected_value, *p, tmp);
-        if (!memcmp (tmp, number, length) && match_cnt++ == 0)
+        if (!memcmp (tmp, number, length) && n_matches++ == 0)
           *best_guess = *p;
       }
-  return match_cnt;
+  return n_matches;
 }
 
 /* Returns the double value that is just greater than -DBL_MAX,
@@ -203,14 +203,14 @@ float_get_lowest (void)
   return x;
 }
 \f
-/* Returns CNT bits in X starting from the given bit OFS. */
+/* Returns N bits in X starting from the given bit OFS. */
 static inline uint64_t
-get_bits (uint64_t x, int ofs, int cnt)
+get_bits (uint64_t x, int ofs, int n)
 {
   assert (ofs >= 0 && ofs < 64);
-  assert (cnt > 0 && cnt < 64);
-  assert (ofs + cnt <= 64);
-  return (x >> ofs) & ((UINT64_C(1) << cnt) - 1);
+  assert (n > 0 && n < 64);
+  assert (ofs + n <= 64);
+  return (x >> ofs) & ((UINT64_C(1) << n) - 1);
 }
 
 /* Returns NATIVE converted to a form that, when stored in