treewide: Replace <name>_cnt by n_<name>s and <name>_cap by allocated_<name>.

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

diff --git a/src/libpspp/float-format.c b/src/libpspp/float-format.c
index 03f9411613938addd72905bb1dae5ab48c28760d..80924e831501c3bec68b863b5a0869c1af293ea5 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,
@@ -480,11 +480,7 @@ extract_hex (const char *s, struct fp *fp)
           if (fp->fraction == 0)
             fp->class = ZERO;
           else if (*s == 'p')
-            {
-              char *tail;
-              fp->exponent += strtol (s + 1, &tail, 10);
-              s = tail;
-            }
+            fp->exponent += strtol (s + 1, NULL, 10);
         }
     }
 }