Browse Source

ckdb - abort on NULL tree in ktree find functions

master
kanoi 10 years ago
parent
commit
616882cf2a
  1. 9
      src/ktree.c

9
src/ktree.c

@ -558,6 +558,9 @@ K_ITEM *find_in_ktree(K_TREE *ktree, K_ITEM *data, double (*cmp_funct)(K_ITEM *,
{ {
double cmp = -1.0; double cmp = -1.0;
if (ktree == NULL)
FAIL("%s", "%K_TREE-F-FINDNULL find ktree is NULL");
while (ktree->isNil == No && cmp != 0.0) while (ktree->isNil == No && cmp != 0.0)
{ {
if ((cmp = (*cmp_funct)(ktree->data, data))) if ((cmp = (*cmp_funct)(ktree->data, data)))
@ -586,6 +589,9 @@ K_ITEM *find_after_in_ktree(K_TREE *ktree, K_ITEM *data, double (*cmp_funct)(K_I
K_TREE *old = NULL; K_TREE *old = NULL;
double cmp = -1.0, oldcmp = -1; double cmp = -1.0, oldcmp = -1;
if (ktree == NULL)
FAIL("%s", "%K_TREE-F-FINDNULL find_after ktree is NULL");
while (ktree->isNil == No && cmp != 0.0) while (ktree->isNil == No && cmp != 0.0)
{ {
if ((cmp = (*cmp_funct)(ktree->data, data))) if ((cmp = (*cmp_funct)(ktree->data, data)))
@ -628,6 +634,9 @@ K_ITEM *find_before_in_ktree(K_TREE *ktree, K_ITEM *data, double (*cmp_funct)(K_
K_TREE *old = NULL; K_TREE *old = NULL;
double cmp = 1.0, oldcmp = 1; double cmp = 1.0, oldcmp = 1;
if (ktree == NULL)
FAIL("%s", "%K_TREE-F-FINDNULL find_before ktree is NULL");
while (ktree->isNil == No && cmp != 0.0) while (ktree->isNil == No && cmp != 0.0)
{ {
if ((cmp = (*cmp_funct)(ktree->data, data))) if ((cmp = (*cmp_funct)(ktree->data, data)))

Loading…
Cancel
Save