This commit is contained in:
Alexandre POMMIER 2020-12-13 20:34:01 +01:00
parent 97ada36100
commit 5ba714c438
2 changed files with 5 additions and 5 deletions

View File

@ -6,7 +6,7 @@
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */ /* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2020/11/29 00:09:57 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 *ft_calloc(size_t nmemb, size_t size)
{ {
void *new; char *new;
int i; int i;
i = 0; i = 0;
@ -27,5 +27,5 @@ void *ft_calloc(size_t nmemb, size_t size)
i++; i++;
} }
} }
return (new); return ((void*)new);
} }

View File

@ -6,7 +6,7 @@
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */ /* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2020/11/29 00:13:42 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; i = 0;
if (!len || !little[i]) if (!len || !little[i])
return (big); return ((char*)big);
if (!little[i]) if (!little[i])
return ((char*)big); return ((char*)big);
while (big[i] && len - i - 1) while (big[i] && len - i - 1)