From 84409d8d3fa8bd9bae28b3523aa6d0c0b3a68406 Mon Sep 17 00:00:00 2001 From: Cabergs Charles Date: Wed, 9 Oct 2019 17:00:48 +0200 Subject: Small update --- Makefile | 14 ++++++++------ auteur | 1 - ft_calloc.c | 4 +--- ft_lstclear_bonus.c | 6 +++--- ft_lstmap_bonus.c | 15 ++++++--------- ft_lstsize_bonus.c | 2 +- ft_strlcat.c | 3 +-- 7 files changed, 20 insertions(+), 25 deletions(-) delete mode 100644 auteur diff --git a/Makefile b/Makefile index 3689094..fe48717 100644 --- a/Makefile +++ b/Makefile @@ -6,11 +6,11 @@ # By: cacharle +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2019/10/08 15:45:53 by cacharle #+# #+# # -# Updated: 2019/10/09 08:56:04 by cacharle ### ########.fr # +# Updated: 2019/10/09 15:48:10 by cacharle ### ########.fr # # # # **************************************************************************** # -LIB = ar rc +LIB = ar rcs RM = rm -f CC = gcc @@ -47,12 +47,14 @@ bonus: $(OBJ) $(BONUSOBJ) $(INCLUDE) $(BONUSINCLUDE) $(CC) $(CCFLAGS) -c -o $@ $< clean: - rm -f $(OBJ) $(BONUSOBJ) + $(RM) $(OBJ) $(BONUSOBJ) fclean: clean - rm -f $(NAME) + $(RM) $(NAME) re: fclean all -so: $(OBJ) libft.h - $(CC) -shared -fPIC -Wl,-soname,libft.so -o libft.so $(OBJ) +rebonus: fclean bonus + +so: $(OBJ) $(BONUSOBJ) $(INCLUDE) + $(CC) -shared -fPIC -Wl,-soname,libft.so -o libft.so $(OBJ) $(BONUSOBJ) diff --git a/auteur b/auteur deleted file mode 100644 index 718becd..0000000 --- a/auteur +++ /dev/null @@ -1 +0,0 @@ -cacharle diff --git a/ft_calloc.c b/ft_calloc.c index 9248e54..622bdd2 100644 --- a/ft_calloc.c +++ b/ft_calloc.c @@ -6,7 +6,7 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/10/07 12:45:37 by cacharle #+# #+# */ -/* Updated: 2019/10/09 09:07:26 by cacharle ### ########.fr */ +/* Updated: 2019/10/09 12:45:31 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -18,9 +18,7 @@ void *ft_calloc(size_t count, size_t size) void *mem; if (count == 0 || size == 0) - { return (NULL); - } if ((mem = malloc(count * size)) == NULL) return (NULL); ft_bzero(mem, count * size); diff --git a/ft_lstclear_bonus.c b/ft_lstclear_bonus.c index 933b6d5..f8fad93 100644 --- a/ft_lstclear_bonus.c +++ b/ft_lstclear_bonus.c @@ -6,7 +6,7 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/10/09 09:02:39 by cacharle #+# #+# */ -/* Updated: 2019/10/09 09:08:22 by cacharle ### ########.fr */ +/* Updated: 2019/10/09 13:30:09 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -20,8 +20,8 @@ void ft_lstclear(t_list **lst, void (*del)(void *)) while (*lst != NULL) { tmp = (*lst)->next; - (*del)((*lst)->content); - free(*lst); + ft_lstdelone(*lst, del); *lst = tmp; } + *lst = NULL; } diff --git a/ft_lstmap_bonus.c b/ft_lstmap_bonus.c index 4cb195f..3a0247a 100644 --- a/ft_lstmap_bonus.c +++ b/ft_lstmap_bonus.c @@ -6,7 +6,7 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/10/09 09:03:57 by cacharle #+# #+# */ -/* Updated: 2019/10/09 09:09:13 by cacharle ### ########.fr */ +/* Updated: 2019/10/09 12:41:39 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -16,14 +16,11 @@ t_list *ft_lstmap(t_list *lst, t_list *(*f)(t_list *)) { t_list *mapped; - t_list *tmp; - while (lst != NULL) - { - tmp = ft_lstnew(lst->content); - tmp->next = lst->next; - tmp = (*f)(tmp); - ft_lstadd_back(&mapped, tmp); - } + if (lst == NULL) + return (NULL); + if ((mapped = ft_lstnew(lst->content)) == NULL) + return (NULL); + mapped->next = ft_lstmap(lst->next, f); return (mapped); } diff --git a/ft_lstsize_bonus.c b/ft_lstsize_bonus.c index 193fced..02503c1 100644 --- a/ft_lstsize_bonus.c +++ b/ft_lstsize_bonus.c @@ -6,7 +6,7 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/10/09 09:04:28 by cacharle #+# #+# */ -/* Updated: 2019/10/09 09:08:06 by cacharle ### ########.fr */ +/* Updated: 2019/10/09 09:20:36 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/ft_strlcat.c b/ft_strlcat.c index 7d5a957..ad21642 100644 --- a/ft_strlcat.c +++ b/ft_strlcat.c @@ -6,7 +6,7 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/10/07 10:31:37 by cacharle #+# #+# */ -/* Updated: 2019/10/07 10:32:03 by cacharle ### ########.fr */ +/* Updated: 2019/10/09 12:43:28 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -31,6 +31,5 @@ size_t ft_strlcat(char *dst, const char *src, size_t size) } if (dst[size - 1] != '\0') return (src_len + size); - dst[size - 1] = '\0'; return (dst_len + src_len); } -- cgit