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, 20 insertions, 17 deletions

diff --git a/src/ht/ft_htset.c b/src/ht/ft_htset.c
index 68d3752..b3a44ee 100644
--- a/src/ht/ft_htset.c
+++ b/src/ht/ft_htset.c
@@ -6,18 +6,17 @@
 /*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/01/30 08:41:52 by cacharle          #+#    #+#             */
-/*   Updated: 2020/04/01 18:02:12 by charles          ###   ########.fr       */
+/*   Updated: 2020/04/03 07:13:17 by charles          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "libft.h"
 #include "libft_ht.h"
 
 /*
 ** \brief        Create/Update a entry in hash table.
 ** \note         If `key` already exist in `ht`
-**               only updates the list node content.
-**               Else create a new list node in addition the list content.
+**               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
@@ -25,32 +24,36 @@
 ** \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)(t_ftht_entry*))
+t_ftht_entry	*ft_htset(
+	t_ftht *ht,
+	char *key,
+	void *value,
+	void (*del)(void*)
+)
 {
-	t_ftht_digest	digest;
-	t_ftht_entry	*content;
-	t_ftht_bucket	bucket;
+	size_t			digest;
+	t_ftht_entry	*entry;
 	t_ftlst			*tmp;
 
 	if (ht == NULL || key == NULL)
 		return (NULL);
-	if ((content = ft_htentry_new(key, value)) == NULL)
-		return (NULL);
 	digest = ft_hthash(ht, key);
 	tmp = ft_lstlfind(ht->buckets[digest], ft_inter_htkey_cmp, key);
 	if (tmp != NULL)
 	{
 		if (del != NULL)
-			del(tmp->data);
-		tmp->data = content;
+			del(((t_ftht_entry*)tmp->data)->value);
+		((t_ftht_entry*)tmp->data)->value = value;
 		return ((t_ftht_entry*)tmp->data);
 	}
-	if ((bucket = ft_lstnew(content)) == NULL)
+	if ((entry = ft_htentry_new(key, value)) == NULL)
+		return (NULL);
+	if ((tmp = ft_lstnew(entry)) == NULL)
 	{
-		del(content);
+		free(entry->key);
+		free(entry);
 		return (NULL);
 	}
-	ft_lstpush_front(ht->buckets + digest, bucket);
-	return (content);
+	ft_lstpush_front(ht->buckets + digest, tmp);
+	return (entry);
 }