From a983b06df18647cf63fadad5b36f472e06f1075f Mon Sep 17 00:00:00 2001 From: Charles Date: Wed, 20 Nov 2019 02:03:56 +0100 Subject: Protected pre 2019 functions --- ft_lstclear_bonus.c | 4 ++-- ft_lstdelone_bonus.c | 7 ++++--- ft_lstmap_bonus.c | 4 ++-- ft_memdel.c | 4 +++- ft_putstr.c | 14 +++++--------- ft_strclr.c | 6 +++++- ft_strdel.c | 2 +- ft_strequ.c | 4 +++- ft_striter.c | 6 +++++- ft_striteri.c | 6 +++++- ft_strmap.c | 4 +++- ft_strnequ.c | 4 +++- libft.h | 3 ++- 13 files changed, 43 insertions(+), 25 deletions(-) diff --git a/ft_lstclear_bonus.c b/ft_lstclear_bonus.c index e8f0541..23999a0 100644 --- a/ft_lstclear_bonus.c +++ b/ft_lstclear_bonus.c @@ -6,7 +6,7 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/10/09 09:02:39 by cacharle #+# #+# */ -/* Updated: 2019/10/17 11:03:13 by cacharle ### ########.fr */ +/* Updated: 2019/11/20 01:57:09 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -15,7 +15,7 @@ void ft_lstclear(t_list **lst, void (*del)(void *)) { - if (lst == NULL || del == NULL) + if (lst == NULL) return ; if (*lst == NULL) return ; diff --git a/ft_lstdelone_bonus.c b/ft_lstdelone_bonus.c index aaa314f..59515ff 100644 --- a/ft_lstdelone_bonus.c +++ b/ft_lstdelone_bonus.c @@ -6,7 +6,7 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/10/09 09:03:02 by cacharle #+# #+# */ -/* Updated: 2019/10/24 09:36:04 by cacharle ### ########.fr */ +/* Updated: 2019/11/20 01:56:28 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -15,8 +15,9 @@ void ft_lstdelone(t_list *lst, void (*del)(void *)) { - if (lst == NULL || del == NULL) + if (lst == NULL) return ; - (*del)(lst->content); + if (del != NULL) + (*del)(lst->content); free(lst); } diff --git a/ft_lstmap_bonus.c b/ft_lstmap_bonus.c index 81b9949..3d0b20c 100644 --- a/ft_lstmap_bonus.c +++ b/ft_lstmap_bonus.c @@ -6,7 +6,7 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/10/09 09:03:57 by cacharle #+# #+# */ -/* Updated: 2019/10/24 09:41:20 by cacharle ### ########.fr */ +/* Updated: 2019/11/20 01:56:47 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -18,7 +18,7 @@ t_list *ft_lstmap(t_list *lst, void *(*f)(void *), void (*del)(void *)) t_list *mapped; t_list *tmp; - if (lst == NULL || f == NULL || del == NULL) + if (lst == NULL || f == NULL) return (NULL); mapped = NULL; while (lst != NULL) diff --git a/ft_memdel.c b/ft_memdel.c index 206e5af..e67f9f3 100644 --- a/ft_memdel.c +++ b/ft_memdel.c @@ -6,7 +6,7 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/10/07 10:00:56 by cacharle #+# #+# */ -/* Updated: 2019/10/07 10:01:06 by cacharle ### ########.fr */ +/* Updated: 2019/11/20 01:57:44 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,6 +14,8 @@ void ft_memdel(void **ap) { + if (ap == NULL) + return ; free(*ap); *ap = NULL; } diff --git a/ft_putstr.c b/ft_putstr.c index ac402ed..1175e68 100644 --- a/ft_putstr.c +++ b/ft_putstr.c @@ -6,20 +6,16 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/10/07 09:52:12 by cacharle #+# #+# */ -/* Updated: 2019/10/17 09:06:58 by cacharle ### ########.fr */ +/* Updated: 2019/11/20 02:03:11 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ #include +#include "libft.h" void ft_putstr(char const *s) { - int i; - - i = 0; - while (s[i]) - { - write(STDOUT_FILENO, &s[i], 1); - i++; - } + if (s == NULL) + return ; + write(STDOUT_FILENO, s, ft_strlen(s)); } diff --git a/ft_strclr.c b/ft_strclr.c index 2f936bf..c927a46 100644 --- a/ft_strclr.c +++ b/ft_strclr.c @@ -6,12 +6,16 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/10/07 10:15:18 by cacharle #+# #+# */ -/* Updated: 2019/10/07 10:15:24 by cacharle ### ########.fr */ +/* Updated: 2019/11/20 02:02:02 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ +#include "libft.h" + void ft_strclr(char *s) { + if (s == NULL) + return ; while (*s) *s++ = '\0'; } diff --git a/ft_strdel.c b/ft_strdel.c index d62d36d..05cf064 100644 --- a/ft_strdel.c +++ b/ft_strdel.c @@ -6,7 +6,7 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/10/07 10:39:14 by cacharle #+# #+# */ -/* Updated: 2019/10/07 10:39:33 by cacharle ### ########.fr */ +/* Updated: 2019/11/20 01:58:27 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/ft_strequ.c b/ft_strequ.c index ea41207..75ccb81 100644 --- a/ft_strequ.c +++ b/ft_strequ.c @@ -6,7 +6,7 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/10/07 10:18:34 by cacharle #+# #+# */ -/* Updated: 2019/10/07 10:18:41 by cacharle ### ########.fr */ +/* Updated: 2019/11/20 02:00:22 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,5 +14,7 @@ int ft_strequ(char const *s1, char const *s2) { + if (s1 == NULL || s2 == NULL) + return (0); return (ft_strcmp(s1, s2) == 0); } diff --git a/ft_striter.c b/ft_striter.c index a3a2306..f410d24 100644 --- a/ft_striter.c +++ b/ft_striter.c @@ -6,12 +6,16 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/10/07 10:38:16 by cacharle #+# #+# */ -/* Updated: 2019/10/07 10:38:24 by cacharle ### ########.fr */ +/* Updated: 2019/11/20 02:01:32 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ +#include "libft.h" + void ft_striter(char *s, void (*f)(char *)) { + if (s == NULL || f == NULL) + return ; while (*s) (*f)(s++); } diff --git a/ft_striteri.c b/ft_striteri.c index 0d3ccdf..05f15d4 100644 --- a/ft_striteri.c +++ b/ft_striteri.c @@ -6,14 +6,18 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/10/07 10:33:09 by cacharle #+# #+# */ -/* Updated: 2019/10/07 10:37:37 by cacharle ### ########.fr */ +/* Updated: 2019/11/20 02:01:41 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ +#include "libft.h" + void ft_striteri(char *s, void (*f)(unsigned int, char *)) { unsigned int i; + if (s == NULL || f == NULL) + return ; i = 0; while (s[i]) { diff --git a/ft_strmap.c b/ft_strmap.c index 8661a68..74e3820 100644 --- a/ft_strmap.c +++ b/ft_strmap.c @@ -6,7 +6,7 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/10/07 10:29:52 by cacharle #+# #+# */ -/* Updated: 2019/10/07 10:31:29 by cacharle ### ########.fr */ +/* Updated: 2019/11/20 02:02:23 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -19,6 +19,8 @@ char *ft_strmap(char const *s, char (*f)(char)) size_t len; char *mapped; + if (s == NULL || f == NULL) + return (NULL); len = ft_strlen(s); if ((mapped = (char*)malloc(sizeof(char) * (len + 1))) == NULL) return (NULL); diff --git a/ft_strnequ.c b/ft_strnequ.c index 34d0627..e242ee7 100644 --- a/ft_strnequ.c +++ b/ft_strnequ.c @@ -6,7 +6,7 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/10/07 10:30:27 by cacharle #+# #+# */ -/* Updated: 2019/10/07 10:30:33 by cacharle ### ########.fr */ +/* Updated: 2019/11/20 02:00:42 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,5 +14,7 @@ int ft_strnequ(char const *s1, char const *s2, size_t n) { + if (s1 == NULL || s2 == NULL) + return (0); return (ft_strncmp(s1, s2, n) == 0); } diff --git a/libft.h b/libft.h index 87b57c2..f337e14 100644 --- a/libft.h +++ b/libft.h @@ -6,13 +6,14 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/10/07 09:45:02 by cacharle #+# #+# */ -/* Updated: 2019/10/17 09:08:31 by cacharle ### ########.fr */ +/* Updated: 2019/11/20 02:01:10 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef LIBFT_H # define LIBFT_H +# include # include # define TRUE 1 -- cgit