Merge branch 'master' into ft_ssl

10 files changed, 171 insertions, 47 deletions

diff --git a/src/ht/ft_htdelone.c b/src/ht/ft_htdelone.c
index 2c54721..bc2e047 100644
--- a/src/ht/ft_htdelone.c
+++ b/src/ht/ft_htdelone.c
@@ -6,16 +6,25 @@
 /*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/01/30 09:27:18 by cacharle          #+#    #+#             */
-/*   Updated: 2020/02/19 02:35:06 by cacharle         ###   ########.fr       */
+/*   Updated: 2020/04/03 07:14:28 by charles          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "libft.h"
 #include "libft_ht.h"
 
-void	ft_htdelone(t_ftht *ht, char *key, void (*del)(t_ftht_content*))
+/*
+** \brief      Delete one hash table entry
+** \param key  Key of entry to delete
+** \param del  Function to destroy the entry value
+** \note       Do nothing if their is to entry which correspond to key
+*/
+
+void	ft_htdelone(t_ftht *ht, char *key, void (*del)(void*))
 {
-	ft_lstremove_if(ht->entries + ft_hthash(ht, key),
+	ft_inter_htdel_first_order_setup(del);
+	ft_lstremove_if(ht->buckets + ft_hthash(ht, key),
 					ft_inter_htkey_cmp, key,
-					(void (*)(void*))del);
+					(void (*)(void*))ft_inter_htdel_first_order);
+	ft_inter_htdel_first_order_teardown();
 }
diff --git a/src/ht/ft_htdestroy.c b/src/ht/ft_htdestroy.c
index e0442c6..c43754e 100644
--- a/src/ht/ft_htdestroy.c
+++ b/src/ht/ft_htdestroy.c
@@ -5,20 +5,28 @@
 /*                                                    +:+ +:+         +:+     */
 /*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2020/01/30 08:19:06 by cacharle          #+#    #+#             */
-/*   Updated: 2020/01/30 08:33:09 by cacharle         ###   ########.fr       */
+/*   Created: 2020/01/30 08:31:02 by cacharle          #+#    #+#             */
+/*   Updated: 2020/04/03 07:01:30 by charles          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "libft.h"
 #include "libft_ht.h"
 
-void	ft_htdestroy(t_ftht *ht, void (*del)(t_ftht_content*))
+/*
+** \brief      Destroy an hash table.
+** \param del  Function to delete each entry
+** \warning    The del function HAS to free the key
+*/
+
+void	ft_htdestroy(t_ftht *ht, t_ftdel_func del)
 {
 	if (ht == NULL)
 		return ;
+	ft_inter_htdel_first_order_setup(del);
 	while (ht->size-- > 0)
-		ft_lstclear(ht->entries + ht->size, (void (*)(void*))del);
-	free(ht->entries);
+		ft_lstdestroy(ht->buckets + ht->size,
+					(void (*)(void*))ft_inter_htdel_first_order);
+	ft_inter_htdel_first_order_teardown();
+	free(ht->buckets);
 	free(ht);
 }
diff --git a/src/ht/ft_htcontent_new.c b/src/ht/ft_htentry_new.c
index 214e125..12a1159 100644
--- a/src/ht/ft_htcontent_new.c
+++ b/src/ht/ft_htentry_new.c
@@ -1,7 +1,7 @@
 /* ************************************************************************** */
 /*                                                                            */
 /*                                                        :::      ::::::::   */
-/*   ft_htcontent_new.c                                 :+:      :+:    :+:   */
+/*   ft_htentry_new.c                                   :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
 /*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
@@ -13,13 +13,19 @@
 #include "libft.h"
 #include "libft_ht.h"
 
-t_ftht_content	*ft_htcontent_new(char *key, void *value)
+/*
+** \brief      Create a new hash table key/value pair.
+** \param key  Hash entry string key (always duplicated)
+** \return     Content or NULL if an allocation failed.
+*/
+
+t_ftht_entry	*ft_htentry_new(char *key, void *value)
 {
-	t_ftht_content	*content;
+	t_ftht_entry	*content;
 
 	if (key == NULL)
 		return (NULL);
-	if ((content = (t_ftht_content*)malloc(sizeof(t_ftht_content))) == NULL)
+	if ((content = (t_ftht_entry*)malloc(sizeof(t_ftht_entry))) == NULL)
 		return (NULL);
 	if ((content->key = ft_strdup(key)) == NULL)
 	{
diff --git a/src/ht/ft_htget.c b/src/ht/ft_htget.c
index 76e4fb2..75da785 100644
--- a/src/ht/ft_htget.c
+++ b/src/ht/ft_htget.c
@@ -6,24 +6,30 @@
 /*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/01/30 08:33:21 by cacharle          #+#    #+#             */
-/*   Updated: 2020/02/19 01:44:41 by cacharle         ###   ########.fr       */
+/*   Updated: 2020/04/03 07:12:58 by charles          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "libft.h"
 #include "libft_ht.h"
 
+/*
+** \brief      Retrieve a value with a key
+** \param ht   Hash table where key is searched
+** \param key  Searched key
+** \return     Value void pointer at key or NULL if not found
+*/
+
 void	*ft_htget(t_ftht *ht, char *key)
 {
-	
-	t_ftht_digest	digest;
-	t_ftlst			*found;
+	size_t	digest;
+	t_ftlst	*found;
 
 	if (ht == NULL || key == NULL)
 		return (NULL);
 	digest = ft_hthash(ht, key);
-	found = ft_lstlfind(ht->entries[digest], ft_inter_htkey_cmp, key);
+	found = ft_lstlfind(ht->buckets[digest], ft_inter_htkey_cmp, key);
 	if (found == NULL)
 		return (NULL);
-	return (((t_ftht_content*)found->content)->value);
+	return (((t_ftht_entry*)found->data)->value);
 }
diff --git a/src/ht/ft_hthash.c b/src/ht/ft_hthash.c
index e7e696c..c5d42ea 100644
--- a/src/ht/ft_hthash.c
+++ b/src/ht/ft_hthash.c
@@ -12,9 +12,17 @@
 
 #include "libft_ht.h"
 
-t_ftht_digest	ft_hthash(t_ftht *ht, char *key)
+/*
+** \brief      Hash a string
+** \param ht   So that the index is in the hash table bound
+** \param key  String to hash
+** \return     Hash
+*/
+
+// maybe use a less efficient but understandable function
+size_t	ft_hthash(t_ftht *ht, char *key)
 {
-	t_ftht_digest	digest;
+	size_t	digest;
 
 	if (*key == '\0')
 		return (0);
diff --git a/src/ht/ft_htiter.c b/src/ht/ft_htiter.c
new file mode 100644
index 0000000..b854993
--- /dev/null
+++ b/src/ht/ft_htiter.c
@@ -0,0 +1,31 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_htiter.c                                        :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2020/04/01 18:02:24 by charles           #+#    #+#             */
+/*   Updated: 2020/04/01 18:02:32 by charles          ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "libft_ht.h"
+
+/*
+** \brief Iterate over entry of hash table
+** \param ht  Iterated hash table
+** \param f   Function applied to each entry
+*/
+
+void	ft_htiter(t_ftht *ht, void (*f)(t_ftht_entry*))
+{
+	size_t	i;
+
+	i = 0;
+	while (i < ht->size)
+	{
+		ft_lstiter(ht->buckets[i], (void (*)(void*))f);
+		i++;
+	}
+}
diff --git a/src/ht/ft_htnew.c b/src/ht/ft_htnew.c
index d98a724..585c211 100644
--- a/src/ht/ft_htnew.c
+++ b/src/ht/ft_htnew.c
@@ -6,14 +6,19 @@
 /*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/01/30 08:19:16 by cacharle          #+#    #+#             */
-/*   Updated: 2020/02/10 02:16:20 by cacharle         ###   ########.fr       */
+/*   Updated: 2020/04/04 22:34:55 by charles          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "libft.h"
 #include "libft_ht.h"
 
-t_ftht	*ft_htnew(t_ftsize size)
+/*
+** \brief       Create a new hash table.
+** \param size  Size of the underlying array of linked list (buckets)
+** \return      Created hash table or NULL is an allocation failed
+*/
+
+t_ftht	*ft_htnew(size_t size)
 {
 	t_ftht	*ht;
 
@@ -21,8 +26,8 @@ t_ftht	*ft_htnew(t_ftsize size)
 		return (NULL);
 	if ((ht = (t_ftht*)malloc(sizeof(t_ftht))) == NULL)
 		return (NULL);
-	ht->entries = (t_ftht_entry*)ft_calloc(size, sizeof(t_ftht_entry));
-	if (ht->entries == NULL)
+	ht->buckets = (t_ftlst**)ft_calloc(size, sizeof(t_ftlst*));
+	if (ht->buckets == NULL)
 	{
 		free(ht);
 		return (NULL);
diff --git a/src/ht/ft_htset.c b/src/ht/ft_htset.c
index c7068d5..b3a44ee 100644
--- a/src/ht/ft_htset.c
+++ b/src/ht/ft_htset.c
@@ -6,40 +6,54 @@
 /*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/01/30 08:41:52 by cacharle          #+#    #+#             */
-/*   Updated: 2020/02/19 02:44:10 by cacharle         ###   ########.fr       */
+/*   Updated: 2020/04/03 07:13:17 by charles          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "libft.h"
 #include "libft_ht.h"
 
-t_ftht_content	*ft_htset(t_ftht *ht, char *key, void *value,
-							void (*del)(t_ftht_content*))
+/*
+** \brief        Create/Update a entry in hash table.
+** \note         If `key` already exist in `ht`
+**               only updates the list node entry.
+**               Else create a new list node in addition the list entry.
+** \param ht     Hash table where the entry is modified
+** \param key    Key of the new entry
+** \param value  Value of the new entry
+** \param del    Destroy function in case the entry is modified.
+** \return       Pointer to the created entry, NULL if an allocation failed.
+*/
+
+t_ftht_entry	*ft_htset(
+	t_ftht *ht,
+	char *key,
+	void *value,
+	void (*del)(void*)
+)
 {
-	t_ftht_digest	digest;
-	t_ftht_content	*content;
-	t_ftht_entry	entry;
+	size_t			digest;
+	t_ftht_entry	*entry;
 	t_ftlst			*tmp;
 
 	if (ht == NULL || key == NULL)
 		return (NULL);
-	if ((content = ft_htcontent_new(key, value)) == NULL)
-		return (NULL);
 	digest = ft_hthash(ht, key);
-	tmp = ft_lstlfind(ht->entries[digest], ft_inter_htkey_cmp, key);
+	tmp = ft_lstlfind(ht->buckets[digest], ft_inter_htkey_cmp, key);
 	if (tmp != NULL)
 	{
 		if (del != NULL)
-			(*del)(tmp->content);
-		tmp->content = content;
-		return ((t_ftht_content*)tmp->content);
+			del(((t_ftht_entry*)tmp->data)->value);
+		((t_ftht_entry*)tmp->data)->value = value;
+		return ((t_ftht_entry*)tmp->data);
 	}
-
-	if ((entry = ft_lstnew(content)) == NULL)
+	if ((entry = ft_htentry_new(key, value)) == NULL)
+		return (NULL);
+	if ((tmp = ft_lstnew(entry)) == NULL)
 	{
-		free(content);
+		free(entry->key);
+		free(entry);
 		return (NULL);
 	}
-	ft_lstadd_front(ht->entries + digest, entry);
-	return (content);
+	ft_lstpush_front(ht->buckets + digest, tmp);
+	return (entry);
 }
diff --git a/src/ht/ft_inter_htdel_first_order.c b/src/ht/ft_inter_htdel_first_order.c
new file mode 100644
index 0000000..b6fd770
--- /dev/null
+++ b/src/ht/ft_inter_htdel_first_order.c
@@ -0,0 +1,33 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_inter_htdel_first_order.c                       :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2020/04/03 06:56:54 by charles           #+#    #+#             */
+/*   Updated: 2020/04/03 06:58:36 by charles          ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "libft_ht.h"
+
+static t_ftdel_func	g_htdelone_value_del_func = NULL;
+
+void	ft_inter_htdel_first_order(t_ftht_entry *entry)
+{
+	if (g_htdelone_value_del_func != NULL)
+		g_htdelone_value_del_func(entry->value);
+	free(entry->key);
+	free(entry);
+}
+
+void	ft_inter_htdel_first_order_setup(t_ftdel_func del)
+{
+	g_htdelone_value_del_func = del;
+}
+
+void	ft_inter_htdel_first_order_teardown(void)
+{
+	g_htdelone_value_del_func = NULL;
+}
diff --git a/src/ht/ft_inter_htkey_cmp.c b/src/ht/ft_inter_htkey_cmp.c
index 6f04ecc..e8a0375 100644
--- a/src/ht/ft_inter_htkey_cmp.c
+++ b/src/ht/ft_inter_htkey_cmp.c
@@ -6,16 +6,20 @@
 /*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/01/30 09:24:39 by cacharle          #+#    #+#             */
-/*   Updated: 2020/02/19 02:03:14 by cacharle         ###   ########.fr       */
+/*   Updated: 2020/02/28 12:20:43 by cacharle         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "libft.h"
 #include "libft_ht.h"
 
+/*
+** Hash table internal function to compare key string in linked list.
+*/
+
 int	ft_inter_htkey_cmp(const void *ref_key, const void *content)
 {
 	if (ref_key == NULL || content == NULL)
 		return (-1);
-	return (ft_strcmp((char*)ref_key, ((t_ftht_content*)content)->key));
+	return (ft_strcmp((char*)ref_key, ((t_ftht_entry*)content)->key));
 }