Imagelibrary/Containers
1
0
Fork 0
mirror of https://github.com/bkthomps/Containers.git synced 2025-11-16 12:34:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove debugging from set

Browse Source
This commit is contained in:
Bailey Thompson
2017-12-29 11:58:05 -05:00
committed by GitHub
parent e5c15efe41
commit 4d665a7e4d
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/set.c
View File

@@ -24,8 +24,6 @@
#include <memory.h>
#include <errno.h>
#include "set.h"
// Remove when released
#include <assert.h>
struct _set {
size_t key_size;
@@ -101,7 +99,6 @@ static void set_reference_parent(set me,
} else if (parent->parent->left == parent) {
parent->parent->left = child;
} else {
assert(parent->parent->right == parent);
parent->parent->right = child;
}
}
@@ -154,7 +151,6 @@ static struct node *set_repair(set me,
parent->balance = 1;
child->balance = -1;
} else {
assert(child->balance == 1);
parent->balance = 0;
child->balance = 0;
}
@@ -166,7 +162,6 @@ static struct node *set_repair(set me,
parent->balance = -1;
child->balance = 1;
} else {
assert(child->balance == -1);
parent->balance = 0;
child->balance = 0;
}
@@ -182,7 +177,6 @@ static struct node *set_repair(set me,
parent->balance = 0;
child->balance = 0;
} else {
assert(grand_child->balance == -1);
parent->balance = 1;
child->balance = 0;
}
@@ -199,14 +193,13 @@ static struct node *set_repair(set me,
parent->balance = 0;
child->balance = 0;
} else {
assert(grand_child->balance == -1);
parent->balance = 0;
child->balance = 1;
}
grand_child->balance = 0;
return grand_child;
}
assert(0);
// Impossible to get here.
return NULL;
}
@@ -343,8 +336,6 @@ static struct node *set_equal_match(set me, const void *const key)
} else {
return traverse;
}
assert(traverse->left == NULL || traverse->left->parent == traverse);
assert(traverse->right == NULL || traverse->right->parent == traverse);
}
}
@@ -556,11 +547,9 @@ bool set_remove(set me, void *const key)
static void set_clear_root(struct node *const root)
{
if (root->left != NULL) {
assert(root->left->parent == root);
set_clear_root(root->left);
}
if (root->right != NULL) {
assert(root->right->parent == root);
set_clear_root(root->right);
}
free(root->key);

12
tst/set.c
View File

@@ -45,6 +45,14 @@ static int set_verify_recursive(struct node *const item)
const int right_val = *(int *) item->right->key;
assert(left_val < right_val);
}
if (item->left != NULL) {
assert(item->left->parent == item);
assert(item->left->parent->key == item->key);
}
if (item->right != NULL) {
assert(item->right->parent == item);
assert(item->right->parent->key == item->key);
}
return max + 1;
#else
return 0;
@@ -80,9 +88,9 @@ static void stub_set_clear(set me)
static set stub_set_destroy(set me)
{
set_destroy(me);
set ret = set_destroy(me);
set_verify_recursive(me->root);
return NULL;
return ret;
}
static int compare_int(const void *const one, const void *const two)