diff --git a/Makefile b/Makefile index 901c31b..2019249 100644 --- a/Makefile +++ b/Makefile @@ -14,14 +14,6 @@ DEPS = $(_DEP:%.h=$(IDIR)/%.h) CFLAGS = -I$(IDIR) CFLAGS += -Wall -Wextra -Werror -g3 -# ft_putstr -# ft_atoi -# ft_putchar -# ft_putnbrendl -# ft_putnbrendl_fd -# ft_putchar_fd -# ft_putnbr_fd - SRCS = ft_memset.c \ ft_bzero.c \ ft_memcpy.c \ @@ -29,7 +21,10 @@ SRCS = ft_memset.c \ ft_memmove.c \ ft_memchr.c \ ft_memcmp.c \ - ft_strlen.c \ + ft_memalloc.c \ + ft_memdel.c \ + ft_calloc.c \ + \ ft_isalpha.c \ ft_isdigit.c \ ft_isalnum.c \ @@ -38,6 +33,8 @@ SRCS = ft_memset.c \ ft_isprint.c \ ft_toupper.c \ ft_tolower.c \ + \ + ft_strlen.c \ ft_strchr.c \ ft_strrchr.c \ ft_strchrset.c \ @@ -45,37 +42,10 @@ SRCS = ft_memset.c \ ft_strlcpy.c \ ft_strlcat.c \ ft_strnstr.c \ - ft_atoi.c \ - ft_atol.c \ - ft_calloc.c \ ft_strdup.c \ - \ - ft_substr.c \ ft_strjoin.c \ ft_strtrim.c \ - ft_split.c \ - ft_itoa.c \ - ft_utoa.c \ ft_strmapi.c \ - ft_putchar_fd.c \ - ft_putstr_fd.c \ - ft_putendl_fd.c \ - ft_putnbr_fd.c \ - \ - ft_lstcreate.c \ - ft_lstpush_back.c \ - ft_lstpush_front.c \ - ft_lstloop.c \ - ft_lstloop_back.c \ - ft_lstbegin.c \ - ft_lstend.c \ - ft_lstfind.c \ - ft_lstinsert.c \ - ft_lsterase.c \ - ft_lstfree.c \ - ft_lstlen.c \ - ft_lstcopy.c \ - \ ft_strcat.c \ ft_strcmp.c \ ft_strcpy.c \ @@ -91,15 +61,33 @@ SRCS = ft_memset.c \ ft_strmap.c \ ft_strnequ.c \ ft_strnew.c \ - ft_memalloc.c \ - ft_memdel.c \ - ft_putchar.c \ - ft_putendl.c \ - ft_putnbr.c \ - ft_putnbrendl.c \ - ft_putnbrendl_fd.c \ + ft_substr.c \ + ft_split.c \ + \ + ft_atoi.c \ + ft_atol.c \ + ft_itoa.c \ + ft_utoa.c \ + \ + ft_putchar_fd.c \ + ft_putstr_fd.c \ + ft_putnbr_fd.c \ ft_putnbrbase.c \ - ft_putstr.c \ + \ + ft_lstcreate.c \ + ft_lstpush_back.c \ + ft_lstpush_front.c \ + ft_lstloop.c \ + ft_lstloop_back.c \ + ft_lstbegin.c \ + ft_lstend.c \ + ft_lstfind.c \ + ft_lstinsert.c \ + ft_lsterase.c \ + ft_lstfree.c \ + ft_lstlen.c \ + ft_lstcopy.c \ + \ ft_any.c \ ft_atoibase.c \ ft_convertbase.c \ @@ -126,9 +114,8 @@ SRCS = ft_memset.c \ \ ft_arrintchr.c - # ft_lstremove.c \ - ft_lstfind.c - # ft_lstnew.c \ + # deleted : \ + ft_lstnew.c \ ft_lstadd_front.c \ ft_lstsize.c \ ft_lstlast.c \ @@ -136,7 +123,15 @@ SRCS = ft_memset.c \ ft_lstdelone.c \ ft_lstclear.c \ ft_lstiter.c \ - ft_lstmap.c + ft_lstmap.c \ + \ + ft_putstr.c \ + ft_putchar.c \ + ft_putendl.c \ + ft_putnbr.c \ + ft_putnbrendl.c \ + ft_putnbrendl_fd.c \ + ft_putendl_fd.c \ ODIR = ./builds diff --git a/srcs/ft_lst_find.bak b/deleted/ft_lst_find.bak similarity index 100% rename from srcs/ft_lst_find.bak rename to deleted/ft_lst_find.bak diff --git a/srcs/ft_lstadd_back.bak b/deleted/ft_lstadd_back.bak similarity index 100% rename from srcs/ft_lstadd_back.bak rename to deleted/ft_lstadd_back.bak diff --git a/srcs/ft_lstadd_front.bak b/deleted/ft_lstadd_front.bak similarity index 100% rename from srcs/ft_lstadd_front.bak rename to deleted/ft_lstadd_front.bak diff --git a/srcs/ft_lstclear.bak b/deleted/ft_lstclear.bak similarity index 100% rename from srcs/ft_lstclear.bak rename to deleted/ft_lstclear.bak diff --git a/srcs/ft_lstdelone.bak b/deleted/ft_lstdelone.bak similarity index 100% rename from srcs/ft_lstdelone.bak rename to deleted/ft_lstdelone.bak diff --git a/srcs/ft_lstiter.bak b/deleted/ft_lstiter.bak similarity index 100% rename from srcs/ft_lstiter.bak rename to deleted/ft_lstiter.bak diff --git a/srcs/ft_lstlast.bak b/deleted/ft_lstlast.bak similarity index 100% rename from srcs/ft_lstlast.bak rename to deleted/ft_lstlast.bak diff --git a/srcs/ft_lstmap.bak b/deleted/ft_lstmap.bak similarity index 100% rename from srcs/ft_lstmap.bak rename to deleted/ft_lstmap.bak diff --git a/srcs/ft_lstnew.bak b/deleted/ft_lstnew.bak similarity index 100% rename from srcs/ft_lstnew.bak rename to deleted/ft_lstnew.bak diff --git a/srcs/ft_lstsize.bak b/deleted/ft_lstsize.bak similarity index 100% rename from srcs/ft_lstsize.bak rename to deleted/ft_lstsize.bak diff --git a/srcs/ft_putchar.c b/deleted/ft_putchar.c similarity index 100% rename from srcs/ft_putchar.c rename to deleted/ft_putchar.c diff --git a/srcs/ft_putendl.c b/deleted/ft_putendl.c similarity index 100% rename from srcs/ft_putendl.c rename to deleted/ft_putendl.c diff --git a/srcs/ft_putendl_fd.c b/deleted/ft_putendl_fd.c similarity index 100% rename from srcs/ft_putendl_fd.c rename to deleted/ft_putendl_fd.c diff --git a/srcs/ft_putnbr.c b/deleted/ft_putnbr.c similarity index 100% rename from srcs/ft_putnbr.c rename to deleted/ft_putnbr.c diff --git a/srcs/ft_putnbrendl.c b/deleted/ft_putnbrendl.c similarity index 100% rename from srcs/ft_putnbrendl.c rename to deleted/ft_putnbrendl.c diff --git a/srcs/ft_putnbrendl_fd.c b/deleted/ft_putnbrendl_fd.c similarity index 100% rename from srcs/ft_putnbrendl_fd.c rename to deleted/ft_putnbrendl_fd.c diff --git a/srcs/ft_putstr.c b/deleted/ft_putstr.c similarity index 100% rename from srcs/ft_putstr.c rename to deleted/ft_putstr.c diff --git a/includes/libft.h b/includes/libft.h index 16430c8..2d13ab4 100644 --- a/includes/libft.h +++ b/includes/libft.h @@ -6,7 +6,7 @@ /* By: hulamy +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/11/25 14:45:53 by hulamy #+# #+# */ -/* Updated: 2022/03/24 16:38:25 by simplonco ### ########.fr */ +/* Updated: 2022/03/24 17:00:08 by simplonco ### ########.fr */ /* */ /* ************************************************************************** */ @@ -52,10 +52,19 @@ char **ft_split(char const *s, char c); char *ft_itoa(long int n); char *ft_utoa(unsigned long int n); char *ft_strmapi(char const *s, char (*f)(unsigned int, char)); + void ft_putchar_fd(char c, int fd); void ft_putstr_fd(char *s, int fd); -void ft_putendl_fd(char *s, int fd); void ft_putnbr_fd(int n, int fd); +void ft_putnbrbase(int nbr, char *base); + +/* +void ft_putchar(char c); +void ft_putendl(char const *str); +void ft_putnbr(int nbr); +void ft_putstr(char const *str); +void ft_putendl_fd(char *s, int fd); +*/ typedef struct s_list { @@ -108,11 +117,6 @@ int ft_strnequ(char const *s1, char const *s2, size_t n); char *ft_strnew(size_t size); void *ft_memalloc(size_t size); void ft_memdel(void **ap); -void ft_putchar(char c); -void ft_putendl(char const *str); -void ft_putnbr(int nbr); -void ft_putstr(char const *str); -void ft_putnbrbase(int nbr, char *base); int ft_atoibase(char *str, char *base); char *ft_convertbase(char *nbr, char *base_from, char *base_to); char *ft_convertbase_free(char *nbr, char *b_from, char *b_to); diff --git a/srcs/ft_lstremove.delete b/srcs/ft_lstremove.delete deleted file mode 100644 index 08cd46d..0000000 --- a/srcs/ft_lstremove.delete +++ /dev/null @@ -1,31 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_lstremove.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: simplonco +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2022/03/23 22:44:55 by simplonco #+# #+# */ -/* Updated: 2022/03/23 22:46:30 by simplonco ### ########.fr */ -/* */ -/* ************************************************************************** */ - -/* - * remove an element of the list, by moving the content of the next element - * and delete and free the next element - */ - -#include "libft.h" - -void ft_lstremove(t_list *lst, void (*del)(void *)) -{ - t_list *next_tmp; - - if (!lst || !del) - return ; - next_tmp = lst->next; - del(lst->content); - lst->content = lst->next->content; - lst->next = lst->next->next; - free(next_tmp); -} diff --git a/srcs/ft_lstremove_next.delete b/srcs/ft_lstremove_next.delete deleted file mode 100644 index 926f5d5..0000000 --- a/srcs/ft_lstremove_next.delete +++ /dev/null @@ -1,30 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_lstremove_next.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: simplonco +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2022/03/23 21:42:05 by simplonco #+# #+# */ -/* Updated: 2022/03/23 21:42:55 by simplonco ### ########.fr */ -/* */ -/* ************************************************************************** */ - -/* - * remove the next element of the list, delete its content, and free it - * then rejoin the list without this element - */ - -#include "libft.h" - -void ft_lstremove_next(t_list *lst, void (*del)(void *)) -{ - t_list *next_tmp; - - if (!lst || !lst->next || !del) - return ; - next_tmp = lst->next->next; - del(lst->next->content); - free(lst->next); - lst->next = next_tmp; -} diff --git a/srcs/ft_putnbrbase.c b/srcs/ft_putnbrbase.c index bf0d627..e98bac4 100644 --- a/srcs/ft_putnbrbase.c +++ b/srcs/ft_putnbrbase.c @@ -6,7 +6,7 @@ /* By: hulamy +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2018/11/16 15:17:00 by hulamy #+# #+# */ -/* Updated: 2018/11/16 15:23:43 by hulamy ### ########.fr */ +/* Updated: 2022/03/24 17:01:57 by simplonco ### ########.fr */ /* */ /* ************************************************************************** */ @@ -47,13 +47,13 @@ void ft_putnbrbase(int nbr, char *base) { if (n < 0) { - ft_putchar('-'); + ft_putchar_fd('-', 1); n = -n; } while (base[i]) i++; if (n >= i) ft_putnbrbase(n / i, base); - ft_putchar(base[n % i]); + ft_putchar_fd(base[n % i], 1); } }