From c1306320c24de6a33bb6c3fad7370f7918a37aba Mon Sep 17 00:00:00 2001 From: Adam Joly Date: Thu, 14 Dec 2023 06:00:29 +0100 Subject: [PATCH] finished --- get_next_line_utils.c | 18 +++++++++--------- get_next_line_utils_bonus.c | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/get_next_line_utils.c b/get_next_line_utils.c index 37fcc75..ce5d005 100644 --- a/get_next_line_utils.c +++ b/get_next_line_utils.c @@ -6,7 +6,7 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/12/01 17:12:02 by adjoly #+# #+# */ -/* Updated: 2023/12/08 17:52:41 by adjoly ### ########.fr */ +/* Updated: 2023/12/14 05:34:46 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ @@ -69,23 +69,23 @@ size_t ft_strlcpy(char *dst, char *src, size_t size) void *ft_calloc(size_t nmemb, size_t size) { - char *str; + char *result; size_t i; i = 0; if (nmemb == 0 || size == 0) return (malloc(1)); + if (((unsigned long long)(size * nmemb) > 4294967295)) + return (NULL); if ((int)size < 0 && (int)nmemb < 0) return (NULL); - if ((unsigned long long)(size * nmemb) > 4294967295) + result = malloc(size * nmemb); + if (!result) return (NULL); - str = malloc(nmemb * size); - if (!str) - return (NULL); - while (i < (nmemb * size)) + while (i < (size * nmemb)) { - *(unsigned char *)(str + i) = '\0'; + *(unsigned char *)(result + i) = '\0'; i++; } - return (str); + return (result); } diff --git a/get_next_line_utils_bonus.c b/get_next_line_utils_bonus.c index 2d6e67e..2deef0f 100644 --- a/get_next_line_utils_bonus.c +++ b/get_next_line_utils_bonus.c @@ -6,7 +6,7 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/12/01 17:12:02 by adjoly #+# #+# */ -/* Updated: 2023/12/08 17:54:32 by adjoly ### ########.fr */ +/* Updated: 2023/12/14 05:59:38 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ @@ -69,23 +69,23 @@ size_t ft_strlcpy(char *dst, char *src, size_t size) void *ft_calloc(size_t nmemb, size_t size) { - char *str; + char *result; size_t i; i = 0; if (nmemb == 0 || size == 0) return (malloc(1)); + if (((unsigned long long)(size * nmemb) > 4294967295)) + return (NULL); if ((int)size < 0 && (int)nmemb < 0) return (NULL); - if ((unsigned long long)(size * nmemb) > 4294967295) + result = malloc(size * nmemb); + if (!result) return (NULL); - str = malloc(nmemb * size); - if (!str) - return (NULL); - while (i < (nmemb * size)) + while (i < (size * nmemb)) { - *(unsigned char *)(str + i) = '\0'; + *(unsigned char *)(result + i) = '\0'; i++; } - return (str); + return (result); }