tvdu29/libft
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove double linked list, added insert add ans insert sort linked list

Browse Source
This commit is contained in:
Tanguy MAZE 2018-10-01 12:43:35 +02:00
parent 85b142c22f
commit 492b26f7fe
7 changed files with 34 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -6,7 +6,7 @@
# By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ # # By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2018/04/07 12:47:06 by tmaze #+# #+# # # Created: 2018/04/07 12:47:06 by tmaze #+# #+# #
# Updated: 2018/09/30 17:47:40 by tmaze ### ########.fr # # Updated: 2018/10/01 12:35:21 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 \ 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_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_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_lst2add.c ft_lst2del.c ft_lst2delone.c ft_lst2new.c ft_lst2size.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_lstsort.c ft_lstaddsort.c
OBJS = $(SRCS:.c=.o) OBJS = $(SRCS:.c=.o)
INCLS = -I. INCLS = -I.

20
ft_lst2delone.c
View File

@ -1,20 +0,0 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_lst2delone.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2018/09/30 17:19:23 by tmaze #+# #+# */
/* Updated: 2018/09/30 17:25:38 by tmaze ### ########.fr */
/* */
/* ************************************************************************** */
#include "libft.h"
void ft_lst2delone(t_list2 **alst, void (*del)(void*, size_t))
{
(*del)((*alst)->content, (*alst)->content_size);
free(*alst);
*alst = NULL;
}

40
ft_lst2new.c
View File

@ -1,40 +0,0 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_lst2new.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2018/09/30 17:28:23 by tmaze #+# #+# */
/* Updated: 2018/09/30 17:54:12 by tmaze ### ########.fr */
/* */
/* ************************************************************************** */
#include "libft.h"
t_list2 *ft_lst2new(void const *content, size_t content_size)
{
t_list2 *ret;
if ((ret = (t_list2*)malloc(sizeof(t_list2))) != NULL)
{
if (!content)
{
ret->content = NULL;
ret->content_size = 0;
}
else
{
if ((ret->content = malloc(content_size)) == NULL)
{
free(ret);
return (0);
}
ft_memmove(ret->content, content, content_size);
ret->content_size = content_size;
}
ret->next = NULL;
ret->prev = NULL;
}
return (ret);
}

21
ft_lst2size.c
View File

@ -1,21 +0,0 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_lst2size.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2018/09/30 17:38:55 by tmaze #+# #+# */
/* Updated: 2018/09/30 17:39:19 by tmaze ### ########.fr */
/* */
/* ************************************************************************** */
#include "libft.h"
size_t ft_lst2size(t_list2 *lst)
{
if (lst == NULL)
return (0);
else
return (ft_lst2size(lst->next) + 1);
}

19
ft_lst2del.c → ft_lstaddsort.c
View File

@ -1,20 +1,25 @@
/* ************************************************************************** */ /* ************************************************************************** */
/* */ /* */
/* ::: :::::::: */ /* ::: :::::::: */
/* ft_lst2del.c :+: :+: :+: */ /* ft_lstaddsort.c :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */ /* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2018/09/30 17:32:37 by tmaze #+# #+# */ /* Created: 2018/10/01 11:57:25 by tmaze #+# #+# */
/* Updated: 2018/09/30 17:39:27 by tmaze ### ########.fr */ /* Updated: 2018/10/01 12:40:27 by tmaze ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "libft.h" #include "libft.h"
void ft_lst2del(t_list2 **alst, void (*del)(void*, size_t)) void ft_lstaddsort(t_list **lst, t_list *new, int (*f)(void *c1, void *c2),
int rev)
{ {
if ((*alst)->next != NULL) t_list *sorted;
ft_lst2del(&((*alst)->next), del);
ft_lst2delone(alst, del); sorted = *lst;
while (sorted && ((*f)(sorted->content, new->content) <= 0
|| ((*f)(sorted->content, new->content) >= 0 && rev)))
sorted = sorted->next;
ft_lstadd(lst, new);
} }

25
ft_lst2add.c → ft_lstsort.c
View File

@ -1,25 +1,30 @@
/* ************************************************************************** */ /* ************************************************************************** */
/* */ /* */
/* ::: :::::::: */ /* ::: :::::::: */
/* ft_lst2add.c :+: :+: :+: */ /* ft_lstsort.c :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */ /* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2018/09/30 17:07:48 by tmaze #+# #+# */ /* Created: 2018/10/01 11:54:22 by tmaze #+# #+# */
/* Updated: 2018/09/30 18:44:55 by tmaze ### ########.fr */ /* Updated: 2018/10/01 12:42:27 by tmaze ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "libft.h" #include "libft.h"
void ft_lst2add(t_list2 **alst, t_list2 *new) void ft_lstsort(t_list **lst, int (*f)(void *c1, void *c2), int rev)
{ {
if (*alst != NULL) t_list *sorted;
new->next = (*alst)->next; t_list *ind;
(*alst)->next = new; t_list *next;
if (*alst != NULL)
ind = *lst;
sorted = NULL;
while (ind)
{ {
new->prev = *alst; next = ind->next;
new->next->prev = new; ft_lstaddsort(&sorted, ind, (*f), rev);
ind = next;
} }
*lst = sorted;
} }

23
libft.h
View File

@ -6,7 +6,7 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */ /* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2018/04/08 00:12:36 by tmaze #+# #+# */ /* Created: 2018/04/08 00:12:36 by tmaze #+# #+# */
/* Updated: 2018/09/30 17:53:43 by tmaze ### ########.fr */ /* Updated: 2018/10/01 12:38:34 by tmaze ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -49,18 +49,6 @@ typedef struct s_list
struct s_list *next; struct s_list *next;
} t_list; } t_list;
/*
** définition type t_list2
*/
typedef struct s_list2
{
struct s_list2 *prev;
void *content;
size_t content_size;
struct s_list2 *next;
} t_list2;
/* /*
** definition macro BUFF_SIZE ** definition macro BUFF_SIZE
*/ */
@ -179,10 +167,9 @@ size_t ft_nbrlen(int nb);
void ft_putstrpad(char *str, size_t size, char pad, char align); 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_putnbrpad(int nbr, size_t size, char pad, char align);
void ft_lst2add(t_list2 **alst, t_list2 *new); void ft_lstsort(t_list **lst, int (*f)(void *c1, void *c2),
void ft_lst2del(t_list2 **alst, void (*del)(void*, size_t)); int rev);
void ft_lst2delone(t_list2 **alst, void (*del)(void*, size_t)); void ft_lstaddsort(t_list **lst, t_list *new,
t_list2 *ft_lst2new(void const *content, size_t content_size); int (*f)(void *c1, void *c2), int rev);
size_t ft_lst2size(t_list2 *lst);
#endif #endif