diff --git a/Makefile b/Makefile index 9e92341..d162244 100644 --- a/Makefile +++ b/Makefile @@ -52,6 +52,16 @@ SRCS = ft_memset.c \ ft_putstr_fd.c \ ft_putendl_fd.c \ ft_putnbr_fd.c \ + \ + ft_lstnew.c \ + ft_lstadd_front.c \ + ft_lstsize.c \ + ft_lstlast.c \ + ft_lstadd_back.c \ + ft_lstdelone.c \ + ft_lstclear.c \ + ft_lstiter.c \ + ft_lstmap.c \ ODIR = ./builds OBJS = $(SRCS:%.c=$(ODIR)/%.o) diff --git a/srcd/bonus/ft_lstiter.c b/srcd/bonus/ft_lstiter.c index f9b3eee..4874552 100644 --- a/srcd/bonus/ft_lstiter.c +++ b/srcd/bonus/ft_lstiter.c @@ -6,7 +6,7 @@ /* By: hulamy +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/11/25 14:14:11 by hulamy #+# #+# */ -/* Updated: 2019/11/28 17:20:38 by hulamy ### ########.fr */ +/* Updated: 2019/11/29 16:27:05 by hulamy ### ########.fr */ /* */ /* ************************************************************************** */ @@ -75,12 +75,11 @@ void ft_lstiter(t_list *lst, void (*f)(void *)) { - if (lst && f) + if (!f) + return; + while (lst) { - while (lst) - { - f(lst); - lst = lst->next; - } + f(lst->content); + lst = lst->next; } } diff --git a/srcs/ft_lstiter.c b/srcs/ft_lstiter.c index 35427b7..c380e2f 100644 --- a/srcs/ft_lstiter.c +++ b/srcs/ft_lstiter.c @@ -6,7 +6,7 @@ /* By: hulamy +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/11/25 14:14:11 by hulamy #+# #+# */ -/* Updated: 2019/11/28 17:19:34 by hulamy ### ########.fr */ +/* Updated: 2019/11/29 16:23:54 by hulamy ### ########.fr */ /* */ /* ************************************************************************** */ @@ -75,13 +75,11 @@ void ft_lstiter(t_list *lst, void (*f)(void *)) { - - if (lst && f) - { - while (lst) + if (!f) + return; + while (lst) { - f(lst); + f(lst->content); lst = lst->next; } - { } diff --git a/srcs/ft_lstmap.c b/srcs/ft_lstmap.c index 26d9002..1de7f8c 100644 --- a/srcs/ft_lstmap.c +++ b/srcs/ft_lstmap.c @@ -6,7 +6,7 @@ /* By: hulamy +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/11/25 14:15:42 by hulamy #+# #+# */ -/* Updated: 2019/11/25 14:34:19 by hulamy ### ########.fr */ +/* Updated: 2019/11/29 16:21:26 by hulamy ### ########.fr */ /* */ /* ************************************************************************** */ @@ -102,12 +102,12 @@ t_list *ft_lstmap(t_list *lst, void *(*f)(void *), void (*del)(void *)) if (!lst) return (NULL); - tmp = (t_list*)f(lst); + tmp = (t_list*)f(lst->content); new = tmp; while (lst->next) { lst = lst->next; - if (!(tmp->next = (t_list*)f(lst))) + if (!(tmp->next = (t_list*)f(lst->content))) { del(tmp->next->content); free(tmp->next);