X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/88dff7c06017e9b044c617c35c43bd713499f4f3..81d77872a5683c1f0d5e27eb79bdbdcb7ac580f6:/tree234.c diff --git a/tree234.c b/tree234.c index 1fedd767..6a570f70 100644 --- a/tree234.c +++ b/tree234.c @@ -288,15 +288,15 @@ void *find234(tree234 *t, void *e, cmpfn234 cmp) { n = t->root; while (n) { - if ( (c = t->cmp(e, n->elems[0])) < 0) + if ( (c = cmp(e, n->elems[0])) < 0) n = n->kids[0]; else if (c == 0) return n->elems[0]; - else if (n->elems[1] == NULL || (c = t->cmp(e, n->elems[1])) < 0) + else if (n->elems[1] == NULL || (c = cmp(e, n->elems[1])) < 0) n = n->kids[1]; else if (c == 0) return n->elems[1]; - else if (n->elems[2] == NULL || (c = t->cmp(e, n->elems[2])) < 0) + else if (n->elems[2] == NULL || (c = cmp(e, n->elems[2])) < 0) n = n->kids[2]; else if (c == 0) return n->elems[2]; @@ -316,7 +316,7 @@ void *find234(tree234 *t, void *e, cmpfn234 cmp) { * Delete an element e in a 2-3-4 tree. Does not free the element, * merely removes all links to it from the tree nodes. */ -void *del234(tree234 *t, void *e) { +void del234(tree234 *t, void *e) { node234 *n; int ei = -1;