diff --git a/Makefile b/Makefile index 8d98bcc..41e091a 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ # By: tmaze +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2018/04/07 12:47:06 by tmaze #+# #+# # -# Updated: 2018/07/31 13:52:29 by tmaze ### ########.fr # +# Updated: 2018/09/30 17:47: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_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 ft_strndup.c ft_abs.c ft_strnchr.c ft_strrnchr.c get_next_line.c ft_del_words_tables.c ft_putstrn.c ft_nbrlen.c ft_putstrpad.c ft_putnbrpad.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 ft_strndup.c ft_abs.c ft_strnchr.c ft_strrnchr.c get_next_line.c ft_del_words_tables.c ft_putstrn.c ft_nbrlen.c ft_putstrpad.c ft_putnbrpad.c ft_lst2add.c ft_lst2del.c ft_lst2delone.c ft_lst2new.c ft_lst2size.c OBJS = $(SRCS:.c=.o) INCLS = -I. diff --git a/ft_lst2add.c b/ft_lst2add.c index d1fd633..8989dba 100644 --- a/ft_lst2add.c +++ b/ft_lst2add.c @@ -6,7 +6,7 @@ /* By: tmaze +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2018/09/30 17:07:48 by tmaze #+# #+# */ -/* Updated: 2018/09/30 17:15:59 by tmaze ### ########.fr */ +/* Updated: 2018/09/30 17:48:30 by tmaze ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,8 +14,8 @@ void ft_lst2add(t_list2 **alst, t_list2 *new) { - new->next = *alst->next; + new->next = (*alst)->next; new->prev = *alst; new->next->prev = new; - *alst->next = new; + (*alst)->next = new; } diff --git a/ft_lst2new.c b/ft_lst2new.c index 036ce9d..ce106a6 100644 --- a/ft_lst2new.c +++ b/ft_lst2new.c @@ -6,17 +6,17 @@ /* By: tmaze +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2018/09/30 17:28:23 by tmaze #+# #+# */ -/* Updated: 2018/09/30 17:31:46 by tmaze ### ########.fr */ +/* Updated: 2018/09/30 17:54:12 by tmaze ### ########.fr */ /* */ /* ************************************************************************** */ #include "libft.h" -t_list2 *ft_lstnew(void const *content, size_t content_size) +t_list2 *ft_lst2new(void const *content, size_t content_size) { t_list2 *ret; - if ((ret = (t_list*)malloc(sizeof(t_list2))) != NULL) + if ((ret = (t_list2*)malloc(sizeof(t_list2))) != NULL) { if (!content) { diff --git a/libft.h b/libft.h index d1a1151..e5baa82 100644 --- a/libft.h +++ b/libft.h @@ -6,7 +6,7 @@ /* By: tmaze +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2018/04/08 00:12:36 by tmaze #+# #+# */ -/* Updated: 2018/09/30 17:44:18 by tmaze ### ########.fr */ +/* Updated: 2018/09/30 17:53:43 by tmaze ### ########.fr */ /* */ /* ************************************************************************** */ @@ -179,4 +179,10 @@ size_t ft_nbrlen(int nb); void ft_putstrpad(char *str, size_t size, char pad, char align); void ft_putnbrpad(int nbr, size_t size, char pad, char align); +void ft_lst2add(t_list2 **alst, t_list2 *new); +void ft_lst2del(t_list2 **alst, void (*del)(void*, size_t)); +void ft_lst2delone(t_list2 **alst, void (*del)(void*, size_t)); +t_list2 *ft_lst2new(void const *content, size_t content_size); +size_t ft_lst2size(t_list2 *lst); + #endif