projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
First step in making struct variable opaque: the boring mechanical
[pspp-builds.git]
/
src
/
data
/
case.c
diff --git
a/src/data/case.c
b/src/data/case.c
index 9c42107de226dc76bc5c21e6f149ee35892f6db4..e41c0e2235945a64a0ff2867827e7baf203913fc 100644
(file)
--- a/
src/data/case.c
+++ b/
src/data/case.c
@@
-338,10
+338,9
@@
case_compare_2dict (const struct ccase *ca, const struct ccase *cb,
const struct variable *va = *vap;
const struct variable *vb = *vbp;
const struct variable *va = *vap;
const struct variable *vb = *vbp;
- assert (va->type == vb->type);
- assert (va->width == vb->width);
+ assert (var_get_width (va) == var_get_width (vb));
- if (va
->width
== 0)
+ if (va
r_get_width (va)
== 0)
{
double af = case_num (ca, va->fv);
double bf = case_num (cb, vb->fv);
{
double af = case_num (ca, va->fv);
double bf = case_num (cb, vb->fv);
@@
-353,7
+352,7
@@
case_compare_2dict (const struct ccase *ca, const struct ccase *cb,
{
const char *as = case_str (ca, va->fv);
const char *bs = case_str (cb, vb->fv);
{
const char *as = case_str (ca, va->fv);
const char *bs = case_str (cb, vb->fv);
- int cmp = memcmp (as, bs, va
->width
);
+ int cmp = memcmp (as, bs, va
r_get_width (va)
);
if (cmp != 0)
return cmp;
if (cmp != 0)
return cmp;