projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ascii: Always include <sys/ioctl.h> if we're calling ioctl.
[pspp]
/
src
/
data
/
case.c
diff --git
a/src/data/case.c
b/src/data/case.c
index 76769223980e0f820081c2aa6cb1df676bf9937e..70c1b44075355d45310232203923af4867b6962b 100644
(file)
--- a/
src/data/case.c
+++ b/
src/data/case.c
@@
-110,7
+110,7
@@
case_get_cost (const struct caseproto *proto)
{
/* FIXME: improve approximation? */
return (1 + caseproto_get_n_widths (proto)
{
/* FIXME: improve approximation? */
return (1 + caseproto_get_n_widths (proto)
- + 3 * caseproto_get_n_
long_
strings (proto)) * sizeof (union value);
+ + 3 * caseproto_get_n_strings (proto)) * sizeof (union value);
}
/* Changes the prototype for case C, which must not be shared.
}
/* Changes the prototype for case C, which must not be shared.
@@
-206,7
+206,7
@@
case_copy (struct ccase *dst, size_t dst_idx,
if (dst != src)
{
if (dst != src)
{
- if (!dst->proto->n_
long_strings || !src->proto->n_long
_strings)
+ if (!dst->proto->n_
strings || !src->proto->n
_strings)
memcpy (&dst->values[dst_idx], &src->values[src_idx],
sizeof dst->values[0] * n_values);
else
memcpy (&dst->values[dst_idx], &src->values[src_idx],
sizeof dst->values[0] * n_values);
else
@@
-214,7
+214,7
@@
case_copy (struct ccase *dst, size_t dst_idx,
}
else if (dst_idx != src_idx)
{
}
else if (dst_idx != src_idx)
{
- if (!dst->proto->n_
long_
strings)
+ if (!dst->proto->n_strings)
memmove (&dst->values[dst_idx], &src->values[src_idx],
sizeof dst->values[0] * n_values);
else if (dst_idx < src_idx)
memmove (&dst->values[dst_idx], &src->values[src_idx],
sizeof dst->values[0] * n_values);
else if (dst_idx < src_idx)
@@
-333,8
+333,7
@@
const uint8_t *
case_str (const struct ccase *c, const struct variable *v)
{
assert_variable_matches_case (c, v);
case_str (const struct ccase *c, const struct variable *v)
{
assert_variable_matches_case (c, v);
- size_t idx = var_get_case_index (v);
- return value_str (&c->values[idx], caseproto_get_width (c->proto, idx));
+ return c->values[var_get_case_index (v)].s;
}
/* Returns the string value of the `union value' in C numbered
}
/* Returns the string value of the `union value' in C numbered
@@
-346,7
+345,7
@@
const uint8_t *
case_str_idx (const struct ccase *c, size_t idx)
{
assert (idx < c->proto->n_widths);
case_str_idx (const struct ccase *c, size_t idx)
{
assert (idx < c->proto->n_widths);
- return
value_str (&c->values[idx], caseproto_get_width (c->proto, idx))
;
+ return
c->values[idx].s
;
}
/* Returns the string value of the `union value' in C for
}
/* Returns the string value of the `union value' in C for
@@
-363,7
+362,7
@@
case_str_rw (struct ccase *c, const struct variable *v)
assert_variable_matches_case (c, v);
size_t idx = var_get_case_index (v);
assert (!case_is_shared (c));
assert_variable_matches_case (c, v);
size_t idx = var_get_case_index (v);
assert (!case_is_shared (c));
- return
value_str_rw (&c->values[idx], caseproto_get_width (c->proto, idx))
;
+ return
c->values[idx].s
;
}
/* Returns the string value of the `union value' in C numbered
}
/* Returns the string value of the `union value' in C numbered
@@
-378,7
+377,7
@@
case_str_rw_idx (struct ccase *c, size_t idx)
{
assert (idx < c->proto->n_widths);
assert (!case_is_shared (c));
{
assert (idx < c->proto->n_widths);
assert (!case_is_shared (c));
- return
value_str_rw (&c->values[idx], caseproto_get_width (c->proto, idx))
;
+ return
c->values[idx].s
;
}
/* Compares the values of the N_VARS variables in VP
}
/* Compares the values of the N_VARS variables in VP
@@
-497,7
+496,7
@@
copy_backward (struct ccase *dst, size_t dst_idx,
{
size_t i;
{
size_t i;
- for (i = n_values; i-- != 0;
)
+ for (i = n_values; i-- != 0;)
value_copy (&dst->values[dst_idx + i], &src->values[src_idx + i],
caseproto_get_width (dst->proto, dst_idx + i));
}
value_copy (&dst->values[dst_idx + i], &src->values[src_idx + i],
caseproto_get_width (dst->proto, dst_idx + i));
}