push
This commit is contained in:
parent
97ada36100
commit
5ba714c438
@ -6,7 +6,7 @@
|
||||
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* 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);
|
||||
}
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* 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)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user