Skip to content
Snippets Groups Projects
Commit 763d5e6d authored by vitawrap's avatar vitawrap
Browse files

Trees: assert inutile, tree_remove decr size

parent 4bb3166b
No related branches found
No related tags found
No related merge requests found
...@@ -183,8 +183,8 @@ static void delete_tree_node(struct tree_node_t * curr, void (*freeKey)(void *), ...@@ -183,8 +183,8 @@ static void delete_tree_node(struct tree_node_t * curr, void (*freeKey)(void *),
* par rapport aux valeurs deleteKey et deleteData. * par rapport aux valeurs deleteKey et deleteData.
*/ */
void delete_tree(struct tree_t * T, int deleteKey, int deleteData) { void delete_tree(struct tree_t * T, int deleteKey, int deleteData) {
assert(deleteKey == 0 || deleteKey == 1); //assert(deleteKey == 0 || deleteKey == 1);
assert(deleteData == 0 || deleteData == 1); //assert(deleteData == 0 || deleteData == 1);
// A FAIRE // A FAIRE
assert(T); assert(T);
if (get_root(T)) if (get_root(T))
...@@ -545,5 +545,7 @@ static struct tree_node_t * remove_tree_node(struct tree_node_t * curr, void * k ...@@ -545,5 +545,7 @@ static struct tree_node_t * remove_tree_node(struct tree_node_t * curr, void * k
void * tree_remove(struct tree_t * T, void * key) { void * tree_remove(struct tree_t * T, void * key) {
void* data = NULL; void* data = NULL;
struct tree_node_t* node = remove_tree_node(get_root(T), key, &data, tree_is_balanced(T), T->preceed); struct tree_node_t* node = remove_tree_node(get_root(T), key, &data, tree_is_balanced(T), T->preceed);
if (node)
decrease_tree_size(T);
return data; return data;
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment