From 9c8139622599dfbf04abf230c50c13ad7117476d Mon Sep 17 00:00:00 2001 From: kinou Date: Fri, 11 Dec 2020 18:42:06 +0100 Subject: [PATCH] push --- ft_isalnum.c | 6 +++--- ft_isalpha.c | 4 ++-- ft_isascii.c | 4 ++-- ft_isdigit.c | 4 ++-- ft_isprint.c | 4 ++-- ft_lstclear.c | 13 ++++++------- ft_memcpy.c | 4 ++-- ft_memmove.c | 8 +++++--- ft_strchr.c | 6 +++--- ft_strdup.c | 5 +++-- ft_strncmp.c | 4 ++-- ft_strrchr.c | 7 ++++--- 12 files changed, 36 insertions(+), 33 deletions(-) diff --git a/ft_isalnum.c b/ft_isalnum.c index 69f6093..9dafa7a 100644 --- a/ft_isalnum.c +++ b/ft_isalnum.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/11/29 00:10:08 by apommier #+# #+# */ -/* Updated: 2020/11/29 17:04:06 by apommier ### ########.fr */ +/* Updated: 2020/12/11 18:10:51 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -15,9 +15,9 @@ int ft_isalnum(int c) { if (c <= 9 && c >= 0) - return (c); + return (1); else if ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z')) - return (c); + return (1); else return (0); } diff --git a/ft_isalpha.c b/ft_isalpha.c index af8d29e..f9cbf7f 100644 --- a/ft_isalpha.c +++ b/ft_isalpha.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/11/29 00:10:17 by apommier #+# #+# */ -/* Updated: 2020/12/11 15:44:14 by apommier ### ########.fr */ +/* Updated: 2020/12/11 18:11:03 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -15,7 +15,7 @@ int ft_isalpha(int c) { if ((c > 64 && c < 90) || (c > 96 && c < 122)) - return (c); + return (1); else return (0); } diff --git a/ft_isascii.c b/ft_isascii.c index ca31d76..be6ac40 100644 --- a/ft_isascii.c +++ b/ft_isascii.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/11/29 00:10:30 by apommier #+# #+# */ -/* Updated: 2020/11/29 17:04:48 by apommier ### ########.fr */ +/* Updated: 2020/12/11 18:11:18 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -15,7 +15,7 @@ int ft_isascii(int c) { if (c >= 0 && c <= 127) - return (c); + return (1); else return (0); } diff --git a/ft_isdigit.c b/ft_isdigit.c index 863ad17..b47d808 100644 --- a/ft_isdigit.c +++ b/ft_isdigit.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/11/29 00:10:39 by apommier #+# #+# */ -/* Updated: 2020/11/29 17:05:09 by apommier ### ########.fr */ +/* Updated: 2020/12/11 18:11:30 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -15,7 +15,7 @@ int ft_isdigit(int c) { if (c <= 9 && c >= 0) - return (c); + return (1); else return (0); } diff --git a/ft_isprint.c b/ft_isprint.c index 4c959a3..1915c16 100644 --- a/ft_isprint.c +++ b/ft_isprint.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/11/29 00:10:55 by apommier #+# #+# */ -/* Updated: 2020/11/29 17:05:23 by apommier ### ########.fr */ +/* Updated: 2020/12/11 18:11:43 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -15,7 +15,7 @@ int ft_isprint(int c) { if (c > 31 && c < 127) - return (c); + return (1); else return (0); } diff --git a/ft_lstclear.c b/ft_lstclear.c index 810c0ab..3fe9aa7 100644 --- a/ft_lstclear.c +++ b/ft_lstclear.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/12/09 19:58:04 by apommier #+# #+# */ -/* Updated: 2020/12/11 17:47:15 by apommier ### ########.fr */ +/* Updated: 2020/12/11 18:39:14 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -15,15 +15,14 @@ void ft_lstclear(t_list **lst, void (*del)(void*)) { t_list *chr; - t_list *chr2; chr = *lst; - while (chr) + while (*lst) { - chr2 = chr->next; - del(chr->content); - free(chr); - chr = chr2; + chr = *lst->next; + del(*lst->content); + free(*lst); + *lst = chr; } lst = 0; } diff --git a/ft_memcpy.c b/ft_memcpy.c index 342f039..8ed1530 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/11 18:04:45 by apommier ### ########.fr */ +/* Updated: 2020/12/11 18:15:39 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -21,7 +21,7 @@ void *ft_memcpy(void *dest, const void *src, size_t n) i = 0; p = (unsigned char*)dest; p2 = (unsigned char*)src; - while (n > 0 && p[i] && p2[i]) + while (n > 0 && p2[i]) { n--; p[i] = p2[i]; diff --git a/ft_memmove.c b/ft_memmove.c index a4ab982..33fe5b9 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/11/29 17:07:14 by apommier ### ########.fr */ +/* Updated: 2020/12/11 18:20:38 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,6 +14,8 @@ void *ft_memmove(void *dest, const void *src, size_t n) { + if (!size || !dest || !src) + return (dest) size_t i; i = 0; @@ -21,7 +23,7 @@ void *ft_memmove(void *dest, const void *src, size_t n) { while (n) { - ((char*)dest)[n] = ((char*)src)[n]; + ((unsigned char*)dest)[n] = ((unsigned char*)src)[n]; n--; } } @@ -29,7 +31,7 @@ void *ft_memmove(void *dest, const void *src, size_t n) { while (i < n) { - ((char*)dest)[i] = ((char*)src)[i]; + ((unsigned char*)dest)[i] = ((unsigned char*)src)[i]; i++; } } diff --git a/ft_strchr.c b/ft_strchr.c index f815eb7..a0b171c 100644 --- a/ft_strchr.c +++ b/ft_strchr.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/11/29 00:12:32 by apommier #+# #+# */ -/* Updated: 2020/12/11 16:14:37 by apommier ### ########.fr */ +/* Updated: 2020/12/11 18:23:01 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,9 +14,9 @@ char *ft_strchr(const char *s, int c) { - char *str; + unsigned char *str; - str = (char*)s; + str = (unsigned char*)s; while ((*str != c) || (*str != 0)) str++; if (*str == c) diff --git a/ft_strdup.c b/ft_strdup.c index 2ec8ef0..58ead0f 100644 --- a/ft_strdup.c +++ b/ft_strdup.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/11/29 00:12:43 by apommier #+# #+# */ -/* Updated: 2020/11/29 17:10:17 by apommier ### ########.fr */ +/* Updated: 2020/12/11 18:35:10 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -20,7 +20,7 @@ char *ft_strdup(const char *s) i = 0; while (s[i]) i++; - sdup = malloc(sizeof(char) * i); + sdup = malloc(sizeof(char) * (i + 1)); if (sdup == 0) return (0); i = 0; @@ -29,5 +29,6 @@ char *ft_strdup(const char *s) sdup[i] = s[i]; i++; } + sdup[i] = 0; return (sdup); } diff --git a/ft_strncmp.c b/ft_strncmp.c index 4d0096b..ae68383 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/11/29 17:14:21 by apommier ### ########.fr */ +/* Updated: 2020/12/11 18:32:24 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -24,5 +24,5 @@ int ft_strncmp(const char *s1, const char *s2, size_t n) n--; i++; } - return (0); + return ((unsigned char)(s1[i] - s2[i])); } diff --git a/ft_strrchr.c b/ft_strrchr.c index 44cff07..f50638e 100644 --- a/ft_strrchr.c +++ b/ft_strrchr.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/11/29 00:13:52 by apommier #+# #+# */ -/* Updated: 2020/12/11 16:15:25 by apommier ### ########.fr */ +/* Updated: 2020/12/11 18:24:45 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -16,8 +16,9 @@ char *ft_strrchr(const char *s, int c) { char *str; char *last; - - last = 0; + + if (!s) + return (0); str = (char*)s; while (*str != 0) {