X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Finteger-format.c;h=2713f42b1432ff300cf0a8394486dd0e688fc3b0;hb=a58399ea2ce9421f72cc5771cd215b121bd8f9dd;hp=1d0a4cfc89c9e27debae25c7a56963985a02ec45;hpb=480a0746507ce73d26f528b56dc3ed80195096e0;p=pspp
diff --git a/src/libpspp/integer-format.c b/src/libpspp/integer-format.c
index 1d0a4cfc89..2713f42b14 100644
--- a/src/libpspp/integer-format.c
+++ b/src/libpspp/integer-format.c
@@ -1,119 +1,117 @@
-/* PSPP - computes sample statistics.
- Copyright (C) 2006 Free Software Foundation, Inc.
+/* PSPP - a program for statistical analysis.
+ Copyright (C) 2006, 2010, 2011, 2013 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 the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program. If not, see . */
#include
-#include
+#include "libpspp/integer-format.h"
#include
/* Returns true if FORMAT is a valid integer format. */
static inline bool
-is_integer_format (enum integer_format format)
+is_integer_format (enum integer_format format)
{
return (format == INTEGER_MSB_FIRST
|| format == INTEGER_LSB_FIRST
|| format == INTEGER_VAX);
}
-/* Converts the CNT bytes in INTEGER from SRC integer_format to DST
+/* Converts the N bytes in INTEGER from SRC integer_format to DST
integer_format. */
void
-integer_convert (enum integer_format src, const void *from,
+integer_convert (enum integer_format src, const void *from,
enum integer_format dst, void *to,
- size_t cnt)
+ size_t n)
{
- if (src != dst)
- integer_put (integer_get (src, from, cnt), dst, to, cnt);
+ if (src != dst)
+ integer_put (integer_get (src, from, n), dst, to, n);
else if (from != to)
- memcpy (to, from, cnt);
+ memcpy (to, from, n);
}
-/* Returns the value of the CNT-byte integer at FROM, which is in
+/* Returns the value of the N-byte integer at FROM, which is in
the given FORMAT. */
uint64_t
-integer_get (enum integer_format format, const void *from_, size_t cnt)
+integer_get (enum integer_format format, const void *from_, size_t n)
{
const uint8_t *from = from_;
uint64_t value = 0;
size_t i;
-
+
assert (is_integer_format (format));
- assert (cnt < 8);
+ assert (n <= 8);
- switch (format)
+ switch (format)
{
case INTEGER_MSB_FIRST:
- for (i = 0; i < cnt; i++)
+ for (i = 0; i < n; i++)
value = (value << 8) | from[i];
break;
case INTEGER_LSB_FIRST:
- for (i = 0; i < cnt; i++)
- value = (value << 8) | from[cnt - i - 1];
+ for (i = 0; i < n; i++)
+ value = (value << 8) | from[n - i - 1];
break;
case INTEGER_VAX:
- for (i = 0; i < (cnt & ~1); i++)
+ for (i = 0; i < (n & ~1); i++)
value = (value << 8) | from[i ^ 1];
- if (cnt & 1)
- value = (value << 8) | from[cnt - 1];
+ if (n & 1)
+ value = (value << 8) | from[n - 1];
break;
}
return value;
}
-/* Stores VALUE as a CNT-byte integer at TO, in the given
+/* Stores VALUE as a N-byte integer at TO, in the given
FORMAT. */
void
-integer_put (uint64_t value, enum integer_format format, void *to_, size_t cnt)
+integer_put (uint64_t value, enum integer_format format, void *to_, size_t n)
{
uint8_t *to = to_;
size_t i;
assert (is_integer_format (format));
- assert (cnt < 8);
+ assert (n <= 8);
+
+ value <<= 8 * (8 - n);
- value <<= 8 * (8 - cnt);
-
- switch (format)
+ switch (format)
{
case INTEGER_MSB_FIRST:
- for (i = 0; i < cnt; i++)
+ for (i = 0; i < n; i++)
{
to[i] = value >> 56;
- value <<= 8;
+ value <<= 8;
}
break;
case INTEGER_LSB_FIRST:
- for (i = 0; i < cnt; i++)
+ for (i = 0; i < n; i++)
{
- to[cnt - i - 1] = value >> 56;
+ to[n - i - 1] = value >> 56;
value <<= 8;
}
break;
case INTEGER_VAX:
- for (i = 0; i < (cnt & ~1); i++)
+ for (i = 0; i < (n & ~1); i++)
{
to[i ^ 1] = value >> 56;
- value <<= 8;
+ value <<= 8;
}
- if (cnt & 1)
- to[cnt - 1] = value >> 56;
+ if (n & 1)
+ to[n - 1] = value >> 56;
break;
}
}
@@ -121,7 +119,7 @@ integer_put (uint64_t value, enum integer_format format, void *to_, size_t cnt)
/* Returns true if bytes with index IDX1 and IDX2 in VALUE differ
in value. */
static inline bool
-bytes_differ (uint64_t value, unsigned int idx1, unsigned int idx2)
+bytes_differ (uint64_t value, unsigned int idx1, unsigned int idx2)
{
uint8_t byte1 = value >> (idx1 * 8);
uint8_t byte2 = value >> (idx2 * 8);
@@ -138,7 +136,7 @@ integer_identify (uint64_t expected_value, const void *integer, size_t length,
{
/* Odd-length integers are confusing. */
assert (length % 2 == 0);
-
+
/* LENGTH must be greater than 2 because VAX format is
equivalent to little-endian for 2-byte integers. */
assert (length > 2);