diff --git a/libft/src/ft_string/ft_mem/ft_arena.c b/libft/src/ft_string/ft_mem/ft_arena.c deleted file mode 100644 index 5a3c9e2..0000000 --- a/libft/src/ft_string/ft_mem/ft_arena.c +++ /dev/null @@ -1,33 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_arena.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: bgoulard +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2024/06/25 17:10:05 by bgoulard #+# #+# */ -/* Updated: 2024/06/25 17:40:54 by bgoulard ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "ft_string.h" - -void *ft_arena_alloc(size_t size) -{ - return (ft_narena_alloc(size, 0)); -} - -void *ft_arena_realloc(void *ptr, size_t size) -{ - return (ft_narena_realloc(ptr, size, 0)); -} - -void *ft_arena_calloc(size_t count, size_t size) -{ - return (ft_narena_calloc(count, size, 0)); -} - -void ft_arena_free(void *ptr) -{ - ft_narena_free(ptr, 0); -} diff --git a/libft/src/ft_string/ft_mem/ft_arena_free.c b/libft/src/ft_string/ft_mem/ft_arena_free.c deleted file mode 100644 index e69de29..0000000 diff --git a/libft/src/ft_string/ft_mem/ft_malloc.c b/libft/src/ft_string/ft_mem/ft_malloc.c index 5ea3b5c..6e20967 100644 --- a/libft/src/ft_string/ft_mem/ft_malloc.c +++ b/libft/src/ft_string/ft_mem/ft_malloc.c @@ -6,7 +6,7 @@ /* By: bgoulard +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/07/19 18:20:32 by bgoulard #+# #+# */ -/* Updated: 2024/07/19 18:20:49 by bgoulard ### ########.fr */ +/* Updated: 2024/11/11 21:15:15 by bgoulard ### ########.fr */ /* */ /* ************************************************************************** */ @@ -18,4 +18,3 @@ void *ft_malloc(size_t size) { return (malloc(size)); } - diff --git a/libft/src/ft_string/ft_mem/ft_narena.c b/libft/src/ft_string/ft_mem/ft_narena.c deleted file mode 100644 index f9119e7..0000000 --- a/libft/src/ft_string/ft_mem/ft_narena.c +++ /dev/null @@ -1,76 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_narena.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: bgoulard +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2024/06/25 17:41:16 by bgoulard #+# #+# */ -/* Updated: 2024/06/30 18:06:29 by bgoulard ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "ft_list.h" -#include "ft_list_types.h" -#include "ft_math.h" -#include -#include - -#define FT_NARENAS_MAX 16 -#define FT_AREA_BLOCK_SIZE 4096 - -typedef struct s_arena -{ - void *block_origin; - void *block_current; - void *block_end; -} t_arena; - -t_list *ft_arena_get(int n) -{ - static t_list arena_array[FT_NARENAS_MAX] = {0}; - - if (n < 0 || n >= FT_NARENAS_MAX) - return (NULL); - return (&arena_array[n]); -} - -bool ft_arena_create_handler(t_list *ar_ptr, size_t size) -{ - t_arena *arena; - - size = ft_align_2(size + sizeof(t_arena), FT_AREA_BLOCK_SIZE); - arena = malloc(size); - if (!arena) - return (false); - arena->block_origin = arena + 1; - arena->block_current = arena->block_origin; - arena->block_end = (void *)arena + size; - ar_ptr->data = arena; - return (true); -} - -void *ft_arena_alloc(size_t size, int ar_nb) -{ - t_list *ar_list; - t_arena *arena; - void *ret; - - size = ft_align_2(size, FT_AREA_BLOCK_SIZE); - ar_list = ft_arena_get(ar_nb); - if (!ar_list) - return (NULL); - arena = ft_ll_end(ar_list)->data; - if (!arena && ft_arena_create_handler(ar_list, size) == false) - return (NULL); - // create new block handler - if fail ret null - if (arena->block_origin == NULL || \ - arena->block_current + size > arena->block_end) - { - // allocate a new block - ; - } - ret = arena->block_current; - arena->block_current += size; - return (ret); -} diff --git a/libft/src/ft_string/ft_str/ft_putendl_fd.c b/libft/src/ft_string/ft_str/ft_putendl_fd.c index 7ba02e1..389a67b 100644 --- a/libft/src/ft_string/ft_str/ft_putendl_fd.c +++ b/libft/src/ft_string/ft_str/ft_putendl_fd.c @@ -6,7 +6,7 @@ /* By: bgoulard +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/11/07 23:14:51 by bgoulard #+# #+# */ -/* Updated: 2024/07/19 18:48:33 by bgoulard ### ########.fr */ +/* Updated: 2024/11/11 21:16:45 by bgoulard ### ########.fr */ /* */ /* ************************************************************************** */ @@ -15,7 +15,7 @@ int ft_putendl_fd(const char *s, int fd) { - int ret; + int ret; if (!s) return (-1); diff --git a/libft/src/ft_string/ft_str/ft_putnbr_fd.c b/libft/src/ft_string/ft_str/ft_putnbr_fd.c index 06b8218..b7a2eac 100644 --- a/libft/src/ft_string/ft_str/ft_putnbr_fd.c +++ b/libft/src/ft_string/ft_str/ft_putnbr_fd.c @@ -6,7 +6,7 @@ /* By: bgoulard +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/11/09 09:08:01 by bgoulard #+# #+# */ -/* Updated: 2024/07/19 21:28:41 by bgoulard ### ########.fr */ +/* Updated: 2024/11/11 21:17:05 by bgoulard ### ########.fr */ /* */ /* ************************************************************************** */ @@ -17,12 +17,13 @@ int ft_putnbr_fd(int nb, int fd) { - char result[13] = {0}; + char result[13]; int it; int neg; neg = 0; it = 12; + ft_bzero(result, 13); if (nb == INT_MIN) return (ft_putstr_fd("-2147483648", fd)); if (nb < 0) diff --git a/libft/src/ft_string/ft_string/ft_string_insert.c b/libft/src/ft_string/ft_string/ft_string_insert.c index 396976c..12454d8 100644 --- a/libft/src/ft_string/ft_string/ft_string_insert.c +++ b/libft/src/ft_string/ft_string/ft_string_insert.c @@ -6,7 +6,7 @@ /* By: bgoulard +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/12/09 17:22:33 by bgoulard #+# #+# */ -/* Updated: 2024/07/19 18:46:39 by bgoulard ### ########.fr */ +/* Updated: 2024/11/11 21:17:33 by bgoulard ### ########.fr */ /* */ /* ************************************************************************** */ @@ -38,7 +38,8 @@ int ft_string_insert(t_string *str, const char *insert, size_t index) return (1); } -int ft_string_insert_n(t_string *str, const char *insert, size_t index, size_t n) +int ft_string_insert_n(t_string *str, const char *insert, size_t index, \ + size_t n) { size_t new_len; char *new_str; diff --git a/libft/src/ft_string/ft_string/ft_string_replace.c b/libft/src/ft_string/ft_string/ft_string_replace.c index 1b78ee3..995c883 100644 --- a/libft/src/ft_string/ft_string/ft_string_replace.c +++ b/libft/src/ft_string/ft_string/ft_string_replace.c @@ -6,13 +6,14 @@ /* By: bgoulard +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/12/09 17:53:23 by bgoulard #+# #+# */ -/* Updated: 2024/07/19 18:58:13 by bgoulard ### ########.fr */ +/* Updated: 2024/11/11 21:17:58 by bgoulard ### ########.fr */ /* */ /* ************************************************************************** */ #include "ft_string.h" -int ft_string_replace(t_string *str, const char *to_replace, const char *replace_by) +int ft_string_replace(t_string *str, const char *to_replace, \ + const char *replace_by) { char *tmp; char *tmp2; diff --git a/libft/tests/ft_list/ll_tests/tests_list_push.c b/libft/tests/ft_list/ll_tests/tests_list_push.c index 4565c7f..0bedc77 100644 --- a/libft/tests/ft_list/ll_tests/tests_list_push.c +++ b/libft/tests/ft_list/ll_tests/tests_list_push.c @@ -6,7 +6,7 @@ /* By: bgoulard +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/05/19 16:37:47 by bgoulard #+# #+# */ -/* Updated: 2024/05/19 16:39:15 by bgoulard ### ########.fr */ +/* Updated: 2024/11/11 21:18:36 by bgoulard ### ########.fr */ /* */ /* ************************************************************************** */ @@ -90,20 +90,20 @@ int t_ll_pop(void) } /* - create_2elem_list(&list, (void **)&data, (void **)&data2); // (42)-> (21)-> NULL - data3 = malloc(sizeof(int)); - *data3 = 63; - ft_ll_push(&list, data3); // (63)-> (42)-> (21)-> NULL - pop = ft_ll_pop_back(&list); // 21 : (63)-> (42)-> NULL - if (ft_ll_size(list) != 2) - return (1); - else if (list->data != data3) - return (1); - else if (list->next->data != data) - return (1); - else if (pop != data2) - return (1); - pop = ft_ll_pop_back(&list); // 42 : (63)-> NULL +create_2elem_list(&list, (void **)&data, (void **)&data2); // (42)-> (21)-> NULL +data3 = malloc(sizeof(int)); +*data3 = 63; +ft_ll_push(&list, data3); // (63)-> (42)-> (21)-> NULL +pop = ft_ll_pop_back(&list); // 21 : (63)-> (42)-> NULL +if (ft_ll_size(list) != 2) + return (1); +else if (list->data != data3) + return (1); +else if (list->next->data != data) + return (1); +else if (pop != data2) + return (1); +pop = ft_ll_pop_back(&list); // 42 : (63)-> NULL */ int t_ll_pop_back(void)