From c1ab9e325f1c5640ac3e39a59bd487d56be47fa3 Mon Sep 17 00:00:00 2001 From: Tanguy MAZE Date: Mon, 9 Apr 2018 17:11:13 +0200 Subject: [PATCH] ft_lstgetat, ft_lstsize: replace ft_lstcount --- Makefile | 4 ++-- ft_lstgetat.c | 28 ++++++++++++++++++++++++++++ ft_lstcount.c => ft_lstsize.c | 8 ++++---- libft.h | 5 +++-- 4 files changed, 37 insertions(+), 8 deletions(-) create mode 100644 ft_lstgetat.c rename ft_lstcount.c => ft_lstsize.c (80%) diff --git a/Makefile b/Makefile index e17c329..47d05e1 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ # By: tmaze +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2018/04/07 12:47:06 by tmaze #+# #+# # -# Updated: 2018/04/09 14:04:00 by tmaze ### ########.fr # +# Updated: 2018/04/09 17:01:40 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_lstcount.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_lstsize.c ft_lstgetat.c OBJS = $(SRCS:.c=.o) INCLS = -I. diff --git a/ft_lstgetat.c b/ft_lstgetat.c new file mode 100644 index 0000000..9092b65 --- /dev/null +++ b/ft_lstgetat.c @@ -0,0 +1,28 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_lstgetat.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: tmaze +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2018/04/09 16:35:51 by tmaze #+# #+# */ +/* Updated: 2018/04/09 16:45:36 by tmaze ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "libft.h" + +t_list *ft_lstgetat(t_list *lst, size_t ind) +{ + size_t i; + t_list *tmp; + + i = 0; + tmp = lst; + while (i != ind && tmp) + { + i++; + tmp = tmp->next; + } + return (tmp); +} diff --git a/ft_lstcount.c b/ft_lstsize.c similarity index 80% rename from ft_lstcount.c rename to ft_lstsize.c index b99b8d5..b3bd301 100644 --- a/ft_lstcount.c +++ b/ft_lstsize.c @@ -1,21 +1,21 @@ /* ************************************************************************** */ /* */ /* ::: :::::::: */ -/* ft_lstcount.c :+: :+: :+: */ +/* ft_lstsize.c :+: :+: :+: */ /* +:+ +:+ +:+ */ /* By: tmaze +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2018/04/09 13:55:29 by tmaze #+# #+# */ -/* Updated: 2018/04/09 14:02:11 by tmaze ### ########.fr */ +/* Updated: 2018/04/09 16:46:33 by tmaze ### ########.fr */ /* */ /* ************************************************************************** */ #include "libft.h" -size_t ft_lstcount(t_list *lst) +size_t ft_lstsize(t_list *lst) { if (lst == NULL) return (0); else - return (ft_lstcount(lst->next) + 1); + return (ft_lstsize(lst->next) + 1); } diff --git a/libft.h b/libft.h index 6df6b0b..2f0504b 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/09 14:06:20 by tmaze ### ########.fr */ +/* Updated: 2018/04/09 16:40:59 by tmaze ### ########.fr */ /* */ /* ************************************************************************** */ @@ -118,6 +118,7 @@ int ft_str_is_uppercase(char *str); char *ft_strcapitalize(char *str); size_t ft_strlcpy(char *restrict dst, const char *restrict src,\ size_t size); -size_t ft_lstcount(t_list *lst); +size_t ft_lstsize(t_list *lst); +t_list *ft_lstgetat(t_list *lst, size_t ind); #endif