Changing hash table del function to regular one with a first order internal function, removing a few typedef to instead use standard types

1 files changed, 11 insertions, 17 deletions

diff --git a/test/src/ht/test_ft_htdelone.c b/test/src/ht/test_ft_htdelone.c
index 5ba4822..a64b34e 100644
--- a/test/src/ht/test_ft_htdelone.c
+++ b/test/src/ht/test_ft_htdelone.c
@@ -6,7 +6,7 @@
 /*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/02/19 02:08:00 by cacharle          #+#    #+#             */
-/*   Updated: 2020/02/19 02:46:10 by cacharle         ###   ########.fr       */
+/*   Updated: 2020/04/03 07:08:38 by charles          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -20,23 +20,17 @@ TEST_SETUP(ft_htdelone)
 TEST_TEAR_DOWN(ft_htdelone)
 {}
 
-static void st_del(t_ftht_entry *v)
-{
-	free(v->key);
-	free(v);
-}
-
 TEST(ft_htdelone, basic)
 {
 	t_ftht *ht = ft_htnew(3);
 
-	ft_htset(ht, "bonjour", "je", st_del);
-	ft_htset(ht, "a", "yay", st_del);
-	ft_htset(ht, "b", "aasdf", st_del);
-	ft_htset(ht, "c", "a", st_del);
-	ft_htset(ht, "d", "dd", st_del);
+	ft_htset(ht, "bonjour", strdup("je"), free);
+	ft_htset(ht, "a", strdup("yay"), free);
+	ft_htset(ht, "b", strdup("aasdf"), free);
+	ft_htset(ht, "c", "a", NULL);
+	ft_htset(ht, "d", "dd", NULL);
 
-	ft_htdelone(ht, "bonjour", st_del);
+	ft_htdelone(ht, "bonjour", free);
 	void *ptr = ft_htget(ht, "bonjour");
 	TEST_ASSERT_NULL(ptr);
 	TEST_ASSERT_NOT_NULL(ft_htget(ht, "a"));
@@ -44,25 +38,25 @@ TEST(ft_htdelone, basic)
 	TEST_ASSERT_NOT_NULL(ft_htget(ht, "c"));
 	TEST_ASSERT_NOT_NULL(ft_htget(ht, "d"));
 
-	ft_htdelone(ht, "a", st_del);
+	ft_htdelone(ht, "a", free);
 	ptr = ft_htget(ht, "a");
 	TEST_ASSERT_NULL(ptr);
 	TEST_ASSERT_NOT_NULL(ft_htget(ht, "b"));
 	TEST_ASSERT_NOT_NULL(ft_htget(ht, "c"));
 	TEST_ASSERT_NOT_NULL(ft_htget(ht, "d"));
 
-	ft_htdelone(ht, "b", st_del);
+	ft_htdelone(ht, "b", free);
 	ptr = ft_htget(ht, "b");
 	TEST_ASSERT_NULL(ptr);
 	TEST_ASSERT_NOT_NULL(ft_htget(ht, "c"));
 	TEST_ASSERT_NOT_NULL(ft_htget(ht, "d"));
 
-	ft_htdelone(ht, "c", st_del);
+	ft_htdelone(ht, "c", NULL);
 	ptr = ft_htget(ht, "c");
 	TEST_ASSERT_NULL(ptr);
 	TEST_ASSERT_NOT_NULL(ft_htget(ht, "d"));
 
-	ft_htdelone(ht, "d", st_del);
+	ft_htdelone(ht, "d", NULL);
 	ptr = ft_htget(ht, "d");
 	TEST_ASSERT_NULL(ptr);
 }