From 5ba714c43860992f474bfb843d9d68ef66b7e91f Mon Sep 17 00:00:00 2001 From: Alexandre POMMIER Date: Sun, 13 Dec 2020 20:34:01 +0100 Subject: [PATCH] push --- ft_calloc.c | 6 +++--- ft_strnstr.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ft_calloc.c b/ft_calloc.c index 530edfe..ada732a 100644 --- a/ft_calloc.c +++ b/ft_calloc.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/11/29 00:09:57 by apommier #+# #+# */ -/* Updated: 2020/12/13 20:21:40 by apommier ### ########.fr */ +/* Updated: 2020/12/13 20:29:08 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,7 +14,7 @@ void *ft_calloc(size_t nmemb, size_t size) { - void *new; + char *new; int i; i = 0; @@ -27,5 +27,5 @@ void *ft_calloc(size_t nmemb, size_t size) i++; } } - return (new); + return ((void*)new); } diff --git a/ft_strnstr.c b/ft_strnstr.c index 54880f5..5ee5716 100644 --- a/ft_strnstr.c +++ b/ft_strnstr.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/11/29 00:13:42 by apommier #+# #+# */ -/* Updated: 2020/12/13 20:12:37 by apommier ### ########.fr */ +/* Updated: 2020/12/13 20:24:56 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -19,7 +19,7 @@ char *ft_strnstr(const char *big, const char *little, size_t len) i = 0; if (!len || !little[i]) - return (big); + return ((char*)big); if (!little[i]) return ((char*)big); while (big[i] && len - i - 1)