rm gigo case & need for stoopid if

diff --git a/source/list/list.c b/source/list/list.c
index 3e947afde40599a37dfb9b2abf5b858a0fd252e3..48bc36b0f22b2eb5e9679bde565f22fdd9180991 100644 (file)
--- a/source/list/list.c
+++ b/source/list/list.c
@@ -177,16 +177,13 @@ void list_delete_node(list_t* list, list_node_t* node)
 {
     if(NULL != list && NULL != node)
     {
-        int idx = list_index_of(list, node); //TODO: why the fuck is this necessary?
-        if(idx > -1){
-            if(NULL != node->prev) node->prev->next = node->next;
-            else list->head = node->next;
-            if(NULL != node->next) node->next->prev = node->prev;
-            else list->tail = node->prev;
-            node->next = NULL;
-            node->prev = NULL;
-            mem_release(node);
-        }
+        if(NULL != node->prev) node->prev->next = node->next;
+        else list->head = node->next;
+        if(NULL != node->next) node->next->prev = node->prev;
+        else list->tail = node->prev;
+        node->next = NULL;
+        node->prev = NULL;
+        mem_release(node);
     }
 }
 

diff --git a/tests/test_list.c b/tests/test_list.c
index 6af7a1ab9983e0015f62267881330fb5348c9da0..7c03dd06076ef23e37b851121957b8c20a927d9c 100644 (file)
--- a/tests/test_list.c
+++ b/tests/test_list.c
@@ -711,6 +711,7 @@ TEST_SUITE(List) {
     //-------------------------------------------------------------------------
     // Test list_delete_node function
     //-------------------------------------------------------------------------
+    /*TODO: confirm case is GIGO:
     TEST(Verify_delete_node_does_nothing_if_list_is_empty)
     {
         list_t* list = list_new();
@@ -725,7 +726,7 @@ TEST_SUITE(List) {
         mem_release(bogus);
     }
 
-    /*TODO: confirm case is GIGO:
+    TODO: confirm case is GIGO:
     TEST(Verify_delete_node_does_nothing_if_given_node_not_in_list)
     {
         list_t* list = list_new();