Removing unnecessary stuffmalloc

8 files changed, 0 insertions, 231 deletions

diff --git a/src/ht/ft_htcontent_new.c b/src/ht/ft_htcontent_new.c
deleted file mode 100644
index 214e125..0000000
--- a/src/ht/ft_htcontent_new.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* ************************************************************************** */
-/*                                                                            */
-/*                                                        :::      ::::::::   */
-/*   ft_htcontent_new.c                                 :+:      :+:    :+:   */
-/*                                                    +:+ +:+         +:+     */
-/*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
-/*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2020/01/30 08:45:36 by cacharle          #+#    #+#             */
-/*   Updated: 2020/02/17 04:09:50 by cacharle         ###   ########.fr       */
-/*                                                                            */
-/* ************************************************************************** */
-
-#include "libft.h"
-#include "libft_ht.h"
-
-t_ftht_content	*ft_htcontent_new(char *key, void *value)
-{
-	t_ftht_content	*content;
-
-	if (key == NULL)
-		return (NULL);
-	if ((content = (t_ftht_content*)malloc(sizeof(t_ftht_content))) == NULL)
-		return (NULL);
-	if ((content->key = ft_strdup(key)) == NULL)
-	{
-		free(content);
-		return (NULL);
-	}
-	content->value = value;
-	return (content);
-}
diff --git a/src/ht/ft_htdelone.c b/src/ht/ft_htdelone.c
deleted file mode 100644
index 2c54721..0000000
--- a/src/ht/ft_htdelone.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/* ************************************************************************** */
-/*                                                                            */
-/*                                                        :::      ::::::::   */
-/*   ft_htdelone.c                                      :+:      :+:    :+:   */
-/*                                                    +:+ +:+         +:+     */
-/*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
-/*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2020/01/30 09:27:18 by cacharle          #+#    #+#             */
-/*   Updated: 2020/02/19 02:35:06 by cacharle         ###   ########.fr       */
-/*                                                                            */
-/* ************************************************************************** */
-
-#include "libft.h"
-#include "libft_ht.h"
-
-void	ft_htdelone(t_ftht *ht, char *key, void (*del)(t_ftht_content*))
-{
-	ft_lstremove_if(ht->entries + ft_hthash(ht, key),
-					ft_inter_htkey_cmp, key,
-					(void (*)(void*))del);
-}
diff --git a/src/ht/ft_htdestroy.c b/src/ht/ft_htdestroy.c
deleted file mode 100644
index e0442c6..0000000
--- a/src/ht/ft_htdestroy.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/* ************************************************************************** */
-/*                                                                            */
-/*                                                        :::      ::::::::   */
-/*   ft_htdestroy.c                                     :+:      :+:    :+:   */
-/*                                                    +:+ +:+         +:+     */
-/*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
-/*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2020/01/30 08:19:06 by cacharle          #+#    #+#             */
-/*   Updated: 2020/01/30 08:33:09 by cacharle         ###   ########.fr       */
-/*                                                                            */
-/* ************************************************************************** */
-
-#include "libft.h"
-#include "libft_ht.h"
-
-void	ft_htdestroy(t_ftht *ht, void (*del)(t_ftht_content*))
-{
-	if (ht == NULL)
-		return ;
-	while (ht->size-- > 0)
-		ft_lstclear(ht->entries + ht->size, (void (*)(void*))del);
-	free(ht->entries);
-	free(ht);
-}
diff --git a/src/ht/ft_htget.c b/src/ht/ft_htget.c
deleted file mode 100644
index 76e4fb2..0000000
--- a/src/ht/ft_htget.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* ************************************************************************** */
-/*                                                                            */
-/*                                                        :::      ::::::::   */
-/*   ft_htget.c                                         :+:      :+:    :+:   */
-/*                                                    +:+ +:+         +:+     */
-/*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
-/*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2020/01/30 08:33:21 by cacharle          #+#    #+#             */
-/*   Updated: 2020/02/19 01:44:41 by cacharle         ###   ########.fr       */
-/*                                                                            */
-/* ************************************************************************** */
-
-#include "libft.h"
-#include "libft_ht.h"
-
-void	*ft_htget(t_ftht *ht, char *key)
-{
-	
-	t_ftht_digest	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);
-	if (found == NULL)
-		return (NULL);
-	return (((t_ftht_content*)found->content)->value);
-}
diff --git a/src/ht/ft_hthash.c b/src/ht/ft_hthash.c
deleted file mode 100644
index e7e696c..0000000
--- a/src/ht/ft_hthash.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* ************************************************************************** */
-/*                                                                            */
-/*                                                        :::      ::::::::   */
-/*   ft_hthash.c                                        :+:      :+:    :+:   */
-/*                                                    +:+ +:+         +:+     */
-/*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
-/*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2020/01/30 09:56:01 by cacharle          #+#    #+#             */
-/*   Updated: 2020/01/30 10:34:27 by cacharle         ###   ########.fr       */
-/*                                                                            */
-/* ************************************************************************** */
-
-#include "libft_ht.h"
-
-t_ftht_digest	ft_hthash(t_ftht *ht, char *key)
-{
-	t_ftht_digest	digest;
-
-	if (*key == '\0')
-		return (0);
-	digest = *key++ << 7;
-	while (*key != '\0')
-	{
-		digest = ((1000003 * digest) ^ *key) & (1 << 16);
-		key++;
-	}
-	return (digest % ht->size);
-}
diff --git a/src/ht/ft_htnew.c b/src/ht/ft_htnew.c
deleted file mode 100644
index d98a724..0000000
--- a/src/ht/ft_htnew.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* ************************************************************************** */
-/*                                                                            */
-/*                                                        :::      ::::::::   */
-/*   ft_htnew.c                                         :+:      :+:    :+:   */
-/*                                                    +:+ +:+         +:+     */
-/*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
-/*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2020/01/30 08:19:16 by cacharle          #+#    #+#             */
-/*   Updated: 2020/02/10 02:16:20 by cacharle         ###   ########.fr       */
-/*                                                                            */
-/* ************************************************************************** */
-
-#include "libft.h"
-#include "libft_ht.h"
-
-t_ftht	*ft_htnew(t_ftsize size)
-{
-	t_ftht	*ht;
-
-	if (size == 0)
-		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)
-	{
-		free(ht);
-		return (NULL);
-	}
-	ht->size = size;
-	return (ht);
-}
diff --git a/src/ht/ft_htset.c b/src/ht/ft_htset.c
deleted file mode 100644
index c7068d5..0000000
--- a/src/ht/ft_htset.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* ************************************************************************** */
-/*                                                                            */
-/*                                                        :::      ::::::::   */
-/*   ft_htset.c                                         :+:      :+:    :+:   */
-/*                                                    +:+ +:+         +:+     */
-/*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
-/*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2020/01/30 08:41:52 by cacharle          #+#    #+#             */
-/*   Updated: 2020/02/19 02:44:10 by cacharle         ###   ########.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*))
-{
-	t_ftht_digest	digest;
-	t_ftht_content	*content;
-	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);
-	if (tmp != NULL)
-	{
-		if (del != NULL)
-			(*del)(tmp->content);
-		tmp->content = content;
-		return ((t_ftht_content*)tmp->content);
-	}
-
-	if ((entry = ft_lstnew(content)) == NULL)
-	{
-		free(content);
-		return (NULL);
-	}
-	ft_lstadd_front(ht->entries + digest, entry);
-	return (content);
-}
diff --git a/src/ht/ft_inter_htkey_cmp.c b/src/ht/ft_inter_htkey_cmp.c
deleted file mode 100644
index 6f04ecc..0000000
--- a/src/ht/ft_inter_htkey_cmp.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/* ************************************************************************** */
-/*                                                                            */
-/*                                                        :::      ::::::::   */
-/*   ft_internal_htkey_equal.c                          :+:      :+:    :+:   */
-/*                                                    +:+ +:+         +:+     */
-/*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
-/*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2020/01/30 09:24:39 by cacharle          #+#    #+#             */
-/*   Updated: 2020/02/19 02:03:14 by cacharle         ###   ########.fr       */
-/*                                                                            */
-/* ************************************************************************** */
-
-#include "libft.h"
-#include "libft_ht.h"
-
-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));
-}