From 491835417e51609ea52a4254b34e707d497cd3b6 Mon Sep 17 00:00:00 2001 From: kinou Date: Sun, 13 Dec 2020 21:00:03 +0100 Subject: [PATCH] push --- ft_memcpy.c | 4 +++- ft_memmove.c | 4 +++- ft_split.c | 4 +++- ft_strmapi.c | 4 ++-- ft_strncmp.c | 6 ++---- ft_strtrim.c | 4 ++-- ft_substr.c | 4 ++-- 7 files changed, 17 insertions(+), 13 deletions(-) diff --git a/ft_memcpy.c b/ft_memcpy.c index 4ae901b..a50cc53 100644 --- a/ft_memcpy.c +++ b/ft_memcpy.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/11/29 00:12:03 by apommier #+# #+# */ -/* Updated: 2020/12/13 19:59:15 by apommier ### ########.fr */ +/* Updated: 2020/12/13 20:39:29 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -18,6 +18,8 @@ void *ft_memcpy(void *dest, const void *src, size_t n) char *p; const char *p1; + if (!dest || !src || !n) + return (dest); p = (char*)dest; p1 = (const char*)src; diff --git a/ft_memmove.c b/ft_memmove.c index d937bf4..1ee13aa 100644 --- a/ft_memmove.c +++ b/ft_memmove.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/11/29 00:12:14 by apommier #+# #+# */ -/* Updated: 2020/12/13 20:00:21 by apommier ### ########.fr */ +/* Updated: 2020/12/13 20:40:27 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -17,6 +17,8 @@ void *ft_memmove(void *dest, const void *src, size_t n) size_t i; i = 0; + if (!dest || !src || !n) + return(dest); if (dest > src) { while (n) diff --git a/ft_split.c b/ft_split.c index 486734e..5420379 100644 --- a/ft_split.c +++ b/ft_split.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/12/07 00:54:12 by apommier #+# #+# */ -/* Updated: 2020/12/13 18:39:50 by apommier ### ########.fr */ +/* Updated: 2020/12/13 20:57:53 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -60,6 +60,8 @@ char **ft_split(char const *s, char c) j = 0; i = 0; + if (!s) + return (0); while (s[i]) { while (s[i] == c && s[i]) diff --git a/ft_strmapi.c b/ft_strmapi.c index 23d8632..2f7b21d 100644 --- a/ft_strmapi.c +++ b/ft_strmapi.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/12/08 19:03:09 by apommier #+# #+# */ -/* Updated: 2020/12/11 16:27:53 by apommier ### ########.fr */ +/* Updated: 2020/12/13 20:59:47 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -18,7 +18,7 @@ char *ft_strmapi(char const *s, char (*f)(unsigned int, char)) int i; i = 0; - dest = (char*)calloc(ft_strlen(s) + 1, sizeof(char)); + dest = (char*)ft_calloc(ft_strlen(s) + 1, sizeof(char)); if (!dest) return (0); while (s[i]) diff --git a/ft_strncmp.c b/ft_strncmp.c index eb0f5dd..91f1d0b 100644 --- a/ft_strncmp.c +++ b/ft_strncmp.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/11/29 00:13:31 by apommier #+# #+# */ -/* Updated: 2020/12/13 20:02:10 by apommier ### ########.fr */ +/* Updated: 2020/12/13 20:44:39 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -17,14 +17,12 @@ int ft_strncmp(const char *s1, const char *s2, size_t n) int i; i = 0; - while (n && s1[i] && s2[i]) + while (n && (s1[i] || s2[i])) { if (s1[i] != s2[i]) return ((unsigned char)s1[i] - (unsigned char)s2[i]); n--; i++; } - if (!s1[i] || !s2[i]) - return ((unsigned char)s1[i] - (unsigned char)s2[i]); return (0); } diff --git a/ft_strtrim.c b/ft_strtrim.c index 1f78eaa..91c426a 100644 --- a/ft_strtrim.c +++ b/ft_strtrim.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/11/29 23:52:05 by apommier #+# #+# */ -/* Updated: 2020/12/13 18:57:57 by apommier ### ########.fr */ +/* Updated: 2020/12/13 20:56:20 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -43,7 +43,7 @@ char *ft_strtrim(char const *s1, char const *set) len = len - i - j; if (len < 0) len = 0; - dest = calloc(len + 1, 1); + dest = ft_calloc(len + 1, 1); if (dest == 0 || s1 == 0) return (0); j = 0; diff --git a/ft_substr.c b/ft_substr.c index 33bd40e..b40f17a 100644 --- a/ft_substr.c +++ b/ft_substr.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/11/29 22:54:40 by apommier #+# #+# */ -/* Updated: 2020/12/13 19:24:11 by apommier ### ########.fr */ +/* Updated: 2020/12/13 20:53:46 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -18,7 +18,7 @@ char *ft_substr(char const *s, unsigned int start, size_t len) unsigned int i; i = 0; - dest = malloc(1 * len); + dest = malloc(1 * len + 1); if (dest == 0) return (0); if (start > ft_strlen(s) || len == 0)