From df968eb4d06ed6fa22de583967c026503593fd06 Mon Sep 17 00:00:00 2001 From: Rodrigo Arias Date: Thu, 9 Dec 2021 16:50:18 +0100 Subject: [PATCH] Remove asserts in heap.h --- heap.h | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/heap.h b/heap.h index b3586dc..24fd191 100644 --- a/heap.h +++ b/heap.h @@ -20,8 +20,8 @@ #ifndef HEAP_H #define HEAP_H -#include #include +#include "common.h" typedef struct heap_node { struct heap_node *parent; @@ -170,7 +170,8 @@ heap_pop_max(heap_head_t *head, heap_node_compare_t cmp) size_t size = head->size; heap_node_t *change = heap_get(head, size); - assert(change); + if(change == NULL) + die("heap_pop_max: heap_get() failed\n"); head->size--; @@ -201,8 +202,11 @@ heap_pop_max(heap_head_t *head, heap_node_compare_t cmp) else change->parent->left = NULL; - assert(!change->left); - assert(!change->right); + if(change->left) + die("heap_pop_max: change->left not NULL\n"); + + if(change->right) + die("heap_pop_max: change->right not NULL\n"); change->left = max->left; if (change->left) @@ -239,10 +243,12 @@ heap_insert(heap_head_t *head, heap_node_t *node, heap_node_compare_t cmp) // Right child if (head->size % 2) { - assert(!parent->right); + if(parent->right) + die("heap_insert: parent->right already set\n"); parent->right = node; } else { - assert(!parent->left); + if(parent->left) + die("heap_insert: parent->left already set\n"); parent->left = node; }