diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ht/ft_htdelone.c | 4 | ||||
| -rw-r--r-- | src/ht/ft_htget.c | 8 | ||||
| -rw-r--r-- | src/lst/ft_lstbsearch.c | 8 | ||||
| -rw-r--r-- | src/lst/ft_lstlfind.c | 22 | ||||
| -rw-r--r-- | src/lst/ft_lstlsearch.c | 27 |
5 files changed, 58 insertions, 11 deletions
diff --git a/src/ht/ft_htdelone.c b/src/ht/ft_htdelone.c index e4ab80f..00a0b11 100644 --- a/src/ht/ft_htdelone.c +++ b/src/ht/ft_htdelone.c @@ -6,7 +6,7 @@ /* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/01/30 09:27:18 by cacharle #+# #+# */ -/* Updated: 2020/02/16 02:20:35 by cacharle ### ########.fr */ +/* Updated: 2020/02/17 03:06:58 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -16,6 +16,6 @@ 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_equal, key, + ft_inter_htkey_cmp, key, (void (*)(void*))del); } diff --git a/src/ht/ft_htget.c b/src/ht/ft_htget.c index 6a9d785..c5e7234 100644 --- a/src/ht/ft_htget.c +++ b/src/ht/ft_htget.c @@ -6,7 +6,7 @@ /* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/01/30 08:33:21 by cacharle #+# #+# */ -/* Updated: 2020/02/16 02:23:23 by cacharle ### ########.fr */ +/* Updated: 2020/02/17 03:06:07 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -18,11 +18,9 @@ void *ft_htget(t_ftht *ht, char *key) t_ftht_digest digest; - return (NULL); // lstbsearch breaking if (ht == NULL || key == NULL) return (NULL); digest = ft_hthash(ht, key); - return (((t_ftht_content*)ft_lstbsearch(ht->entries[digest], - ft_inter_htkey_equal, - key)->content)->value); + return (((t_ftht_content*)ft_lstlfind(ht->entries[digest], + ft_inter_htkey_cmp, key)->content)->value); } diff --git a/src/lst/ft_lstbsearch.c b/src/lst/ft_lstbsearch.c index 68dc43b..d694209 100644 --- a/src/lst/ft_lstbsearch.c +++ b/src/lst/ft_lstbsearch.c @@ -6,7 +6,7 @@ /* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/01/30 09:17:51 by cacharle #+# #+# */ -/* Updated: 2020/02/16 04:40:16 by cacharle ### ########.fr */ +/* Updated: 2020/02/17 03:03:21 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -43,12 +43,12 @@ static t_ftlst *st_lstbsearch_rec(t_ftlst *lst, t_ftlst *last, return (NULL); mid = st_lstmiddle(lst, last); if (mid == NULL) - return NULL; + return (NULL); if (mid->next == NULL) { if (cmp(ref, mid->content) == 0) return (mid); - return NULL; + return (NULL); } res = cmp(ref, mid->next->content); if (res < 0) @@ -58,7 +58,7 @@ static t_ftlst *st_lstbsearch_rec(t_ftlst *lst, t_ftlst *last, return (mid->next); } -t_ftlst *ft_lstbsearch(t_ftlst *lst, t_ftcompar_func cmp, +t_ftlst *ft_lstbsearch(t_ftlst *lst, t_ftcompar_func cmp, const void *ref) { return (st_lstbsearch_rec(lst, NULL, cmp, ref)); diff --git a/src/lst/ft_lstlfind.c b/src/lst/ft_lstlfind.c new file mode 100644 index 0000000..ddb890b --- /dev/null +++ b/src/lst/ft_lstlfind.c @@ -0,0 +1,22 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_lstlfind.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2020/02/17 03:04:52 by cacharle #+# #+# */ +/* Updated: 2020/02/17 03:34:19 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "libft_lst.h" + +t_ftlst *ft_lstlfind(t_ftlst *lst, t_ftcompar_func cmp, const void *ref) +{ + if (lst == NULL) + return (NULL); + if (cmp(ref, lst->content) == 0) + return (lst); + return (ft_lstlfind(lst->next, cmp, ref)); +} diff --git a/src/lst/ft_lstlsearch.c b/src/lst/ft_lstlsearch.c new file mode 100644 index 0000000..8d2acc8 --- /dev/null +++ b/src/lst/ft_lstlsearch.c @@ -0,0 +1,27 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_lstlsearch.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2020/02/17 02:57:12 by cacharle #+# #+# */ +/* Updated: 2020/02/17 03:35:45 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "libft_lst.h" + +t_ftlst *ft_lstlsearch(t_ftlst *lst, t_ftcompar_func cmp, const void *ref) +{ + if (lst == NULL) + return (ft_lstnew(ref)); + if (cmp(ref, lst->content) == 0) + return (lst); + if (lst->next == NULL) + { + lst->next = ft_lstnew(ref); + return (lst->next); + } + return (ft_lstlsearch(lst->next, cmp, ref)); +} |