From 5703ae8db754deeea32ce5c2a988a8cd01e4ac1d Mon Sep 17 00:00:00 2001 From: Tanguy MAZE Date: Thu, 19 Apr 2018 14:41:21 +0200 Subject: [PATCH] ft_lstaddend --- Makefile | 4 ++-- ft_lstaddend.c | 31 +++++++++++++++++++++++++++++++ ft_lstdel.c | 3 +-- ft_lstgetlast.c | 2 +- ft_print_words_tables.c | 25 +++++++++++++++++++++++++ ft_putstr.c | 2 +- ft_sort_params.c | 2 +- ft_strsplit.c | 3 +-- libft.h | 4 +++- 9 files changed, 66 insertions(+), 10 deletions(-) create mode 100644 ft_lstaddend.c create mode 100644 ft_print_words_tables.c diff --git a/Makefile b/Makefile index d773947..8abbb60 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ # By: tmaze +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2018/04/07 12:47:06 by tmaze #+# #+# # -# Updated: 2018/04/09 18:27:22 by tmaze ### ########.fr # +# Updated: 2018/04/19 12:24:45 by tmaze ### ########.fr # # # #******************************************************************************# @@ -19,7 +19,7 @@ NAME = libft.a SRCS = ft_memset.c ft_bzero.c ft_memcpy.c ft_memccpy.c ft_memmove.c ft_memchr.c ft_memcmp.c ft_strlen.c ft_strdup.c ft_strcpy.c ft_strncpy.c ft_strcat.c ft_strncat.c ft_strlcat.c ft_strchr.c ft_strrchr.c ft_strstr.c ft_strnstr.c ft_strcmp.c ft_strncmp.c ft_atoi.c ft_isalpha.c ft_isdigit.c ft_isalnum.c ft_isascii.c ft_isprint.c ft_toupper.c ft_tolower.c \ ft_memalloc.c ft_memdel.c ft_strnew.c ft_strdel.c ft_strclr.c ft_striter.c ft_striteri.c ft_strmap.c ft_strmapi.c ft_strequ.c ft_strnequ.c ft_strsub.c ft_strjoin.c ft_strtrim.c ft_strsplit.c ft_itoa.c ft_putchar.c ft_putstr.c ft_putendl.c ft_putnbr.c ft_putchar_fd.c ft_putstr_fd.c ft_putendl_fd.c ft_putnbr_fd.c\ ft_lstnew.c ft_lstdelone.c ft_lstdel.c ft_lstadd.c ft_lstiter.c ft_lstmap.c \ - ft_isupper.c ft_islower.c ft_str_is_alpha.c ft_str_is_lowercase.c ft_str_is_numeric.c ft_str_is_printable.c ft_str_is_uppercase.c ft_strcapitalize.c ft_strlcpy.c ft_strlowcase.c ft_strupcase.c ft_lstsize.c ft_lstgetat.c ft_lstgetlast.c ft_sort_params.c + ft_isupper.c ft_islower.c ft_str_is_alpha.c ft_str_is_lowercase.c ft_str_is_numeric.c ft_str_is_printable.c ft_str_is_uppercase.c ft_strcapitalize.c ft_strlcpy.c ft_strlowcase.c ft_strupcase.c ft_lstsize.c ft_lstgetat.c ft_lstgetlast.c ft_sort_params.c ft_print_words_tables.c ft_lstaddend.c OBJS = $(SRCS:.c=.o) INCLS = -I. diff --git a/ft_lstaddend.c b/ft_lstaddend.c new file mode 100644 index 0000000..f840c58 --- /dev/null +++ b/ft_lstaddend.c @@ -0,0 +1,31 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_lstaddend.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: tmaze +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2018/04/17 20:55:26 by tmaze #+# #+# */ +/* Updated: 2018/04/19 14:32:44 by tmaze ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "libft.h" + +t_list *ft_lstaddend(t_list **alst, t_list *new) +{ + t_list **tmp; + + if (new == NULL) + return (NULL); + if (ft_lstsize(*alst) == 0) + ft_lstadd(alst, new); + else if (ft_lstsize(*alst) > 0) + { + if ((tmp = (t_list**)malloc(sizeof(t_list*))) == NULL) + return (NULL); + *tmp = ft_lstgetlast(*alst); + ft_lstadd(&(*tmp)->next, new); + } + return (*alst); +} diff --git a/ft_lstdel.c b/ft_lstdel.c index ff1ec6c..d80380c 100644 --- a/ft_lstdel.c +++ b/ft_lstdel.c @@ -6,12 +6,11 @@ /* By: tmaze +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2018/04/08 17:19:32 by tmaze #+# #+# */ -/* Updated: 2018/04/08 19:20:07 by tmaze ### ########.fr */ +/* Updated: 2018/04/19 14:36:46 by tmaze ### ########.fr */ /* */ /* ************************************************************************** */ #include "libft.h" -#include void ft_lstdel(t_list **alst, void (*del)(void*, size_t)) { diff --git a/ft_lstgetlast.c b/ft_lstgetlast.c index 40391fe..ebd2bde 100644 --- a/ft_lstgetlast.c +++ b/ft_lstgetlast.c @@ -6,7 +6,7 @@ /* By: tmaze +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2018/04/09 17:34:10 by tmaze #+# #+# */ -/* Updated: 2018/04/09 17:39:37 by tmaze ### ########.fr */ +/* Updated: 2018/04/12 12:23:02 by tmaze ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/ft_print_words_tables.c b/ft_print_words_tables.c new file mode 100644 index 0000000..c69bc01 --- /dev/null +++ b/ft_print_words_tables.c @@ -0,0 +1,25 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_print_words_tables.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: tmaze +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2018/04/15 15:48:16 by tmaze #+# #+# */ +/* Updated: 2018/04/15 15:51:21 by tmaze ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "libft.h" + +void ft_print_words_tables(char **tab) +{ + unsigned int i; + + i = 0; + while(tab[i]) + { + ft_putendl(tab[i]); + i++; + } +} diff --git a/ft_putstr.c b/ft_putstr.c index a195431..3d7077e 100644 --- a/ft_putstr.c +++ b/ft_putstr.c @@ -6,7 +6,7 @@ /* By: tmaze +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2018/04/07 19:13:17 by tmaze #+# #+# */ -/* Updated: 2018/04/10 14:20:31 by tmaze ### ########.fr */ +/* Updated: 2018/04/12 11:23:29 by tmaze ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/ft_sort_params.c b/ft_sort_params.c index e3c81cb..7231eed 100644 --- a/ft_sort_params.c +++ b/ft_sort_params.c @@ -22,7 +22,7 @@ void ft_sort_params(int ac, char **av) while (++i < ac && (j = i)) { tmp = av[i]; - while (j > 1 && strcmp(av[j - 1], tmp) > 0) + while (j > 1 && ft_strcmp(av[j - 1], tmp) > 0) { av[j] = av[j - 1]; j--; diff --git a/ft_strsplit.c b/ft_strsplit.c index 64593bf..c4a9ce2 100644 --- a/ft_strsplit.c +++ b/ft_strsplit.c @@ -6,11 +6,10 @@ /* By: tmaze +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2018/04/07 17:54:29 by tmaze #+# #+# */ -/* Updated: 2018/04/10 14:12:54 by tmaze ### ########.fr */ +/* Updated: 2018/04/15 15:55:03 by tmaze ### ########.fr */ /* */ /* ************************************************************************** */ -#include #include "libft.h" static int count_words(char const *s, char c) diff --git a/libft.h b/libft.h index c6418cc..984f38a 100644 --- a/libft.h +++ b/libft.h @@ -6,7 +6,7 @@ /* By: tmaze +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2018/04/08 00:12:36 by tmaze #+# #+# */ -/* Updated: 2018/04/10 19:08:03 by tmaze ### ########.fr */ +/* Updated: 2018/04/19 14:25:55 by tmaze ### ########.fr */ /* */ /* ************************************************************************** */ @@ -125,5 +125,7 @@ size_t ft_lstsize(t_list *lst); t_list *ft_lstgetat(t_list *lst, size_t ind); t_list *ft_lstgetlast(t_list *lst); void ft_sort_params(int ac, char **av); +void ft_print_words_tables(char **tab); +t_list *ft_lstaddend(t_list **alst, t_list *new); #endif