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 03d8c99062d7af3be1e20bc1af7e4d509d9c2eef..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,66 +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);
-}
-
-/* Returns the 32-bit unsigned integer at P,
-   which need not be aligned. */
-static inline uint32_t
-get_uint32 (const void *p)
-{
-  uint32_t x;
-  memcpy (&x, p, sizeof x);
-  return x;
-}
-
-/* Returns the 64-bit unsigned integer at P,
-   which need not be aligned. */
-static inline uint64_t
-get_uint64 (const void *p)
-{
-  uint64_t x;
-  memcpy (&x, p, sizeof x);
-  return x;
-}
-
-/* Stores 32-bit unsigned integer X at P,
-   which need not be aligned. */
-static inline void
-put_uint32 (uint32_t x, void *p)
-{
-  memcpy (p, &x, sizeof x);
-}
-
-/* Stores 64-bit unsigned integer X at P,
-   which need not be aligned. */
-static inline void
-put_uint64 (uint64_t x, void *p)
-{
-  memcpy (p, &x, sizeof x);
-}
-
-/* Returns NATIVE converted to a form that, when stored in
-   memory, will be in little-endian byte order. */
-static inline uint32_t
-native_to_le32 (uint32_t native)
-{
-  return INTEGER_NATIVE == INTEGER_LSB_FIRST ? native : bswap_32 (native);
-}
-
-/* Returns NATIVE converted to a form that, when stored in
-   memory, will be in big-endian byte order. */
-static inline uint32_t
-native_to_be32 (uint32_t native)
-{
-  return INTEGER_NATIVE == INTEGER_MSB_FIRST ? native : bswap_32 (native);
+  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
@@ -274,22 +222,6 @@ native_to_vax32 (uint32_t native)
                          ((native & 0x00ff00ff) << 8));
 }
 
-/* Returns NATIVE converted to a form that, when stored in
-   memory, will be in little-endian byte order. */
-static inline uint64_t
-native_to_le64 (uint64_t native)
-{
-  return INTEGER_NATIVE == INTEGER_LSB_FIRST ? native : bswap_64 (native);
-}
-
-/* Returns NATIVE converted to a form that, when stored in
-   memory, will be in big-endian byte order. */
-static inline uint64_t
-native_to_be64 (uint64_t native)
-{
-  return INTEGER_NATIVE == INTEGER_MSB_FIRST ? native : bswap_64 (native);
-}
-
 /* Returns NATIVE converted to a form that, when stored in
    memory, will be in VAX-endian byte order. */
 static inline uint64_t
@@ -301,22 +233,6 @@ native_to_vax64 (uint64_t native)
                          ((native & UINT64_C(0x0000000000ff00ff)) << 40));
 }
 
-/* Given LE, obtained from memory in little-endian format,
-   returns its value. */
-static inline uint32_t
-le_to_native32 (uint32_t le)
-{
-  return INTEGER_NATIVE == INTEGER_LSB_FIRST ? le : bswap_32 (le);
-}
-
-/* Given BE, obtained from memory in big-endian format, returns
-   its value. */
-static inline uint32_t
-be_to_native32 (uint32_t be)
-{
-  return INTEGER_NATIVE == INTEGER_MSB_FIRST ? be : bswap_32 (be);
-}
-
 /* Given VAX, obtained from memory in VAX-endian format, returns
    its value. */
 static inline uint32_t
@@ -326,22 +242,6 @@ vax_to_native32 (uint32_t vax)
   return ((be & 0xff00ff00) >> 8) | ((be & 0x00ff00ff) << 8);
 }
 
-/* Given LE, obtained from memory in little-endian format,
-   returns its value. */
-static inline uint64_t
-le_to_native64 (uint64_t le)
-{
-  return INTEGER_NATIVE == INTEGER_LSB_FIRST ? le : bswap_64 (le);
-}
-
-/* Given BE, obtained from memory in big-endian format, returns
-   its value. */
-static inline uint64_t
-be_to_native64 (uint64_t be)
-{
-  return INTEGER_NATIVE == INTEGER_MSB_FIRST ? be : bswap_64 (be);
-}
-
 /* Given VAX, obtained from memory in VAX-endian format, returns
    its value. */
 static inline uint64_t
@@ -580,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);
         }
     }
 }