From 4dce3b1f9e2056d5dc2d640b8abe1cb504da7e6b Mon Sep 17 00:00:00 2001 From: Adam Joly Date: Mon, 6 Nov 2023 11:00:52 +0100 Subject: [PATCH] push to github --- Makefile | 7 +++++-- ft_atoi.c | 2 +- ft_calloc.c | 15 ++++++++++++--- ft_memmove.c | 13 +++++++++++-- ft_strchr.c | 33 ++++++++++----------------------- libft.h | 7 ++++--- libft.so | Bin 15704 -> 15968 bytes 7 files changed, 43 insertions(+), 34 deletions(-) diff --git a/Makefile b/Makefile index e40e196..1696cc5 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ # By: adjoly +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2023/11/01 11:03:22 by adjoly #+# #+# # -# Updated: 2023/11/05 14:57:25 by adjoly ### ########.fr # +# Updated: 2023/11/05 22:23:43 by adjoly ### ########.fr # # # # **************************************************************************** # @@ -27,6 +27,7 @@ SRCS = ft_atoi.c \ ft_strdup.c \ ft_memcpy.c \ ft_memset.c \ + ft_memmove.c \ ft_strlcpy.c \ ft_strlen.c \ ft_substr.c \ @@ -36,7 +37,9 @@ SRCS = ft_atoi.c \ ft_strjoin.c \ ft_strncmp.c \ ft_strchr.c \ - + ft_itoa.c \ + ft_calloc.c \ + OBJS = $(SRCS:.c=.o) FLAGS = -Werror -Wall -Wextra diff --git a/ft_atoi.c b/ft_atoi.c index ec4eecb..541098d 100644 --- a/ft_atoi.c +++ b/ft_atoi.c @@ -6,7 +6,7 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/10/31 09:00:27 by adjoly #+# #+# */ -/* Updated: 2023/11/01 17:15:05 by adjoly ### ########.fr */ +/* Updated: 2023/11/05 15:27:36 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/ft_calloc.c b/ft_calloc.c index 8504518..b39ff62 100644 --- a/ft_calloc.c +++ b/ft_calloc.c @@ -6,13 +6,22 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/11/01 16:02:26 by adjoly #+# #+# */ -/* Updated: 2023/11/01 16:06:22 by adjoly ### ########.fr */ +/* Updated: 2023/11/05 22:23:07 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ #include "libft.h" +#include -void *calloc(size_t nmemb, size_t size) +void *ft_calloc(size_t nmemb, size_t size) { - + void *result; + + if (size != 0 && nmemb != 0 && (nmemb * size) / nmemb != size) + return (NULL); + result = malloc(size * nmemb); + if (result == NULL) + return (NULL); + ft_bzero(result, size * nmemb); + return (result); } diff --git a/ft_memmove.c b/ft_memmove.c index a5dba16..fd5ed7a 100644 --- a/ft_memmove.c +++ b/ft_memmove.c @@ -6,7 +6,7 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/11/03 15:04:04 by adjoly #+# #+# */ -/* Updated: 2023/11/05 14:52:24 by adjoly ### ########.fr */ +/* Updated: 2023/11/05 22:05:37 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,5 +14,14 @@ void *ft_memmove(void *dest, const void *src, size_t n) { - + size_t i; + + i = -1; + if (dest > src) + while (n-- > 0) + ((unsigned char *)dest)[n] = ((unsigned char *)src)[n]; + else if (dest < src) + while (++i < n) + ((unsigned char *)dest)[i] = ((unsigned char *)src)[i]; + return (dest); } diff --git a/ft_strchr.c b/ft_strchr.c index 5af9f0f..b73da82 100644 --- a/ft_strchr.c +++ b/ft_strchr.c @@ -6,30 +6,17 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/11/01 15:45:18 by adjoly #+# #+# */ -/* Updated: 2023/11/05 14:59:50 by adjoly ### ########.fr */ +/* Updated: 2023/11/05 21:33:16 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ -char *ft_strchr(const char *s, int c) -{ - int i; - int j; - char *str_result; +// char *ft_strchr(const char *s, int c) +// { + // int i; - i = 0; - j = 0; - str_result = 0; - while (s[i] != c || s[i]) - i++; - if (s[i] == c) - { - while (s[i]) - { - str_result[j] = s[j + i]; - j++; - } - return (str_result); - } - str_result[i] = '\0'; - return (str_result); -} + // i = 0; + // while (s[i]) + // { + + // } +// } diff --git a/libft.h b/libft.h index d345c6d..eef2e41 100644 --- a/libft.h +++ b/libft.h @@ -6,14 +6,13 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/11/01 10:06:03 by adjoly #+# #+# */ -/* Updated: 2023/11/05 14:57:55 by adjoly ### ########.fr */ +/* Updated: 2023/11/05 21:34:36 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef LIBFT_H # define LIBFT_H -#include # include # include # include @@ -42,6 +41,8 @@ size_t ft_strlcat(char *dst, const char *src, size_t size); char *ft_strjoin(char const *s1, char const *s2); int ft_strncmp(const char *s1, const char *s2, size_t n); int ft_isprint(int c); -void *memchr(const void *s, int c, size_t n); +void *ft_memchr(const void *s, int c, size_t n); +char *ft_itoa(int n); +void *ft_memmove(void *dest, const void *src, size_t n); #endif \ No newline at end of file diff --git a/libft.so b/libft.so index c082c23ca2bdf0fffee8d58f635258c2e3a08566..8fde708cce1b8cdd9c78d7697af888d3637e303c 100755 GIT binary patch delta 4134 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