From e2c6462e9039da407e1db0a476fe60a1aa2bd919 Mon Sep 17 00:00:00 2001 From: Adam Date: Wed, 6 Dec 2023 11:45:25 +0100 Subject: [PATCH] update --- a.out | Bin 0 -> 16520 bytes get_next_line.c | 14 +++----------- get_next_line.h | 3 ++- get_next_line_utils.c | 22 +++++++++++++++++++++- 4 files changed, 26 insertions(+), 13 deletions(-) create mode 100755 a.out diff --git a/a.out b/a.out new file mode 100755 index 0000000000000000000000000000000000000000..3f7617e3cbcbe5257ef33312266f6d5d5b146de3 GIT binary patch literal 16520 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 ZkjFUtWm#HIm(u_7XO%>qN5O-Ne*jd<4!QsU literal 0 HcmV?d00001 diff --git a/get_next_line.c b/get_next_line.c index 618f435..57a4242 100644 --- a/get_next_line.c +++ b/get_next_line.c @@ -6,7 +6,7 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/12/01 17:11:59 by adjoly #+# #+# */ -/* Updated: 2023/12/04 18:44:34 by adjoly ### ########.fr */ +/* Updated: 2023/12/06 11:18:18 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ @@ -34,17 +34,9 @@ char *get_next_line(int fd) if (BUFFER_SIZE <= 0 || fd < 0) return (NULL); - res = malloc(1); - if (!res) - return (NULL); - res[0] = '\0'; + res = ft_calloc(1, 1); if (!buf) - { - buf = malloc((BUFFER_SIZE + 1) * sizeof(char)); - if (!buf) - return (NULL); - buf[0] = '\0'; - } + buf = ft_calloc(sizeof(char), BUFFER_SIZE + 1); while (1) { tmp = ft_strjoin(res, buf); diff --git a/get_next_line.h b/get_next_line.h index dfa8270..26f5e14 100644 --- a/get_next_line.h +++ b/get_next_line.h @@ -6,7 +6,7 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/12/01 17:12:00 by adjoly #+# #+# */ -/* Updated: 2023/12/04 18:38:21 by adjoly ### ########.fr */ +/* Updated: 2023/12/06 11:16:29 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ @@ -24,6 +24,7 @@ char *get_next_line(int fd); char *ft_strjoin(char *s1, char *s2); size_t ft_strlen_til_nl(char *s); size_t ft_strlen(char *s); +void *ft_calloc(size_t nmemb, size_t size); size_t ft_strlcpy(char *dst, char *src, size_t size); #endif \ No newline at end of file diff --git a/get_next_line_utils.c b/get_next_line_utils.c index dfc42f0..fc7a29a 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/04 18:42:35 by adjoly ### ########.fr */ +/* Updated: 2023/12/06 11:21:57 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ @@ -78,3 +78,23 @@ size_t ft_strlcpy(char *dst, char *src, size_t size) dst[i] = '\0'; return (ft_strlen(src)); } + +void *ft_calloc(size_t nmemb, size_t size) +{ + size_t i; + void *result; + + if (size != 0 && nmemb != 0 && (nmemb * size) / nmemb != size) + return (NULL); + if (nmemb == 0 || size == 0) + return (malloc(1)); + result = malloc(size * nmemb); + if (result == NULL) + return (NULL); + while (i < size * nmemb) + { + *(unsigned char *)(result + i) = '\0'; + i++; + } + return (result); +}