moved some unused functions, list and put, in deleted folder
This commit is contained in:
91
Makefile
91
Makefile
@@ -14,14 +14,6 @@ DEPS = $(_DEP:%.h=$(IDIR)/%.h)
|
|||||||
CFLAGS = -I$(IDIR)
|
CFLAGS = -I$(IDIR)
|
||||||
CFLAGS += -Wall -Wextra -Werror -g3
|
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 \
|
SRCS = ft_memset.c \
|
||||||
ft_bzero.c \
|
ft_bzero.c \
|
||||||
ft_memcpy.c \
|
ft_memcpy.c \
|
||||||
@@ -29,7 +21,10 @@ SRCS = ft_memset.c \
|
|||||||
ft_memmove.c \
|
ft_memmove.c \
|
||||||
ft_memchr.c \
|
ft_memchr.c \
|
||||||
ft_memcmp.c \
|
ft_memcmp.c \
|
||||||
ft_strlen.c \
|
ft_memalloc.c \
|
||||||
|
ft_memdel.c \
|
||||||
|
ft_calloc.c \
|
||||||
|
\
|
||||||
ft_isalpha.c \
|
ft_isalpha.c \
|
||||||
ft_isdigit.c \
|
ft_isdigit.c \
|
||||||
ft_isalnum.c \
|
ft_isalnum.c \
|
||||||
@@ -38,6 +33,8 @@ SRCS = ft_memset.c \
|
|||||||
ft_isprint.c \
|
ft_isprint.c \
|
||||||
ft_toupper.c \
|
ft_toupper.c \
|
||||||
ft_tolower.c \
|
ft_tolower.c \
|
||||||
|
\
|
||||||
|
ft_strlen.c \
|
||||||
ft_strchr.c \
|
ft_strchr.c \
|
||||||
ft_strrchr.c \
|
ft_strrchr.c \
|
||||||
ft_strchrset.c \
|
ft_strchrset.c \
|
||||||
@@ -45,37 +42,10 @@ SRCS = ft_memset.c \
|
|||||||
ft_strlcpy.c \
|
ft_strlcpy.c \
|
||||||
ft_strlcat.c \
|
ft_strlcat.c \
|
||||||
ft_strnstr.c \
|
ft_strnstr.c \
|
||||||
ft_atoi.c \
|
|
||||||
ft_atol.c \
|
|
||||||
ft_calloc.c \
|
|
||||||
ft_strdup.c \
|
ft_strdup.c \
|
||||||
\
|
|
||||||
ft_substr.c \
|
|
||||||
ft_strjoin.c \
|
ft_strjoin.c \
|
||||||
ft_strtrim.c \
|
ft_strtrim.c \
|
||||||
ft_split.c \
|
|
||||||
ft_itoa.c \
|
|
||||||
ft_utoa.c \
|
|
||||||
ft_strmapi.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_strcat.c \
|
||||||
ft_strcmp.c \
|
ft_strcmp.c \
|
||||||
ft_strcpy.c \
|
ft_strcpy.c \
|
||||||
@@ -91,15 +61,33 @@ SRCS = ft_memset.c \
|
|||||||
ft_strmap.c \
|
ft_strmap.c \
|
||||||
ft_strnequ.c \
|
ft_strnequ.c \
|
||||||
ft_strnew.c \
|
ft_strnew.c \
|
||||||
ft_memalloc.c \
|
ft_substr.c \
|
||||||
ft_memdel.c \
|
ft_split.c \
|
||||||
ft_putchar.c \
|
\
|
||||||
ft_putendl.c \
|
ft_atoi.c \
|
||||||
ft_putnbr.c \
|
ft_atol.c \
|
||||||
ft_putnbrendl.c \
|
ft_itoa.c \
|
||||||
ft_putnbrendl_fd.c \
|
ft_utoa.c \
|
||||||
|
\
|
||||||
|
ft_putchar_fd.c \
|
||||||
|
ft_putstr_fd.c \
|
||||||
|
ft_putnbr_fd.c \
|
||||||
ft_putnbrbase.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_any.c \
|
||||||
ft_atoibase.c \
|
ft_atoibase.c \
|
||||||
ft_convertbase.c \
|
ft_convertbase.c \
|
||||||
@@ -126,9 +114,8 @@ SRCS = ft_memset.c \
|
|||||||
\
|
\
|
||||||
ft_arrintchr.c
|
ft_arrintchr.c
|
||||||
|
|
||||||
# ft_lstremove.c \
|
# deleted : \
|
||||||
ft_lstfind.c
|
ft_lstnew.c \
|
||||||
# ft_lstnew.c \
|
|
||||||
ft_lstadd_front.c \
|
ft_lstadd_front.c \
|
||||||
ft_lstsize.c \
|
ft_lstsize.c \
|
||||||
ft_lstlast.c \
|
ft_lstlast.c \
|
||||||
@@ -136,7 +123,15 @@ SRCS = ft_memset.c \
|
|||||||
ft_lstdelone.c \
|
ft_lstdelone.c \
|
||||||
ft_lstclear.c \
|
ft_lstclear.c \
|
||||||
ft_lstiter.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
|
ODIR = ./builds
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
|
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2019/11/25 14:45:53 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_itoa(long int n);
|
||||||
char *ft_utoa(unsigned long int n);
|
char *ft_utoa(unsigned long int n);
|
||||||
char *ft_strmapi(char const *s, char (*f)(unsigned int, char));
|
char *ft_strmapi(char const *s, char (*f)(unsigned int, char));
|
||||||
|
|
||||||
void ft_putchar_fd(char c, int fd);
|
void ft_putchar_fd(char c, int fd);
|
||||||
void ft_putstr_fd(char *s, 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_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
|
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);
|
char *ft_strnew(size_t size);
|
||||||
void *ft_memalloc(size_t size);
|
void *ft_memalloc(size_t size);
|
||||||
void ft_memdel(void **ap);
|
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);
|
int ft_atoibase(char *str, char *base);
|
||||||
char *ft_convertbase(char *nbr, char *base_from, char *base_to);
|
char *ft_convertbase(char *nbr, char *base_from, char *base_to);
|
||||||
char *ft_convertbase_free(char *nbr, char *b_from, char *b_to);
|
char *ft_convertbase_free(char *nbr, char *b_from, char *b_to);
|
||||||
|
|||||||
@@ -1,31 +0,0 @@
|
|||||||
/* ************************************************************************** */
|
|
||||||
/* */
|
|
||||||
/* ::: :::::::: */
|
|
||||||
/* ft_lstremove.c :+: :+: :+: */
|
|
||||||
/* +:+ +:+ +:+ */
|
|
||||||
/* By: simplonco <marvin@42.fr> +#+ +:+ +#+ */
|
|
||||||
/* +#+#+#+#+#+ +#+ */
|
|
||||||
/* 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);
|
|
||||||
}
|
|
||||||
@@ -1,30 +0,0 @@
|
|||||||
/* ************************************************************************** */
|
|
||||||
/* */
|
|
||||||
/* ::: :::::::: */
|
|
||||||
/* ft_lstremove_next.c :+: :+: :+: */
|
|
||||||
/* +:+ +:+ +:+ */
|
|
||||||
/* By: simplonco <marvin@42.fr> +#+ +:+ +#+ */
|
|
||||||
/* +#+#+#+#+#+ +#+ */
|
|
||||||
/* 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;
|
|
||||||
}
|
|
||||||
@@ -6,7 +6,7 @@
|
|||||||
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
|
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2018/11/16 15:17:00 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)
|
if (n < 0)
|
||||||
{
|
{
|
||||||
ft_putchar('-');
|
ft_putchar_fd('-', 1);
|
||||||
n = -n;
|
n = -n;
|
||||||
}
|
}
|
||||||
while (base[i])
|
while (base[i])
|
||||||
i++;
|
i++;
|
||||||
if (n >= i)
|
if (n >= i)
|
||||||
ft_putnbrbase(n / i, base);
|
ft_putnbrbase(n / i, base);
|
||||||
ft_putchar(base[n % i]);
|
ft_putchar_fd(base[n % i], 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user