projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 'master' into 'psppsheet'.
[pspp]
/
src
/
libpspp
/
abt.c
diff --git
a/src/libpspp/abt.c
b/src/libpspp/abt.c
index c06047b4abdbb8e128910a17049f972893abd295..ae746183021203605efa169e6989c7cc05844ec3 100644
(file)
--- a/
src/libpspp/abt.c
+++ b/
src/libpspp/abt.c
@@
-351,7
+351,7
@@
void
abt_reaugmented (const struct abt *abt, struct abt_node *p)
{
for (; p != NULL; p = p->up)
abt_reaugmented (const struct abt *abt, struct abt_node *p)
{
for (; p != NULL; p = p->up)
- abt->reaugment (p,
p->down[0], p->down[1],
abt->aux);
+ abt->reaugment (p, abt->aux);
}
/* Moves P around in ABT to compensate for its key having
}
/* Moves P around in ABT to compensate for its key having
@@
-452,8
+452,8
@@
skew (struct abt *abt, struct abt_node *a)
b->up = a->up;
a->up = b;
b->up = a->up;
a->up = b;
- abt->reaugment (a, a
->down[0], a->down[1], a
bt->aux);
- abt->reaugment (b,
b->down[0], b->down[1],
abt->aux);
+ abt->reaugment (a, abt->aux);
+ abt->reaugment (b, abt->aux);
return b;
}
return b;
}
@@
-483,8
+483,8
@@
split (struct abt *abt, struct abt_node *a)
b->level++;
b->level++;
- abt->reaugment (a, a
->down[0], a->down[1], a
bt->aux);
- abt->reaugment (b,
b->down[0], b->down[1],
abt->aux);
+ abt->reaugment (a, abt->aux);
+ abt->reaugment (b, abt->aux);
return b;
}
return b;
}