diff --git a/malloc/libft b/malloc/libft index 0ca8ca81..5e978382 160000 --- a/malloc/libft +++ b/malloc/libft @@ -1 +1 @@ -Subproject commit 0ca8ca817f32fc0345ef93ef74a3abe2583bd89c +Subproject commit 5e978382fff27082681383029d99f76ae5a25ddc diff --git a/malloc/libft_malloc_x86_64_Darwin.so b/malloc/libft_malloc_x86_64_Darwin.so index 0f30e1de..181ae7e5 100755 Binary files a/malloc/libft_malloc_x86_64_Darwin.so and b/malloc/libft_malloc_x86_64_Darwin.so differ diff --git a/malloc/src/error_lib.c b/malloc/src/error_lib.c index 055c3abe..adcacf30 100644 --- a/malloc/src/error_lib.c +++ b/malloc/src/error_lib.c @@ -22,7 +22,7 @@ void error_free_notalloc(void *ptr) ft_putstr_fd(", ??? ", fd); ft_putstr_fd(")", fd); ft_putstr_fd(" malloc: error for object ", fd); - ft_putaddr_fd(ptr, fd); + ft_putnbr_hex_fd((long)ptr, fd); ft_putendl_fd(": pointer being freed was not allocated"FG_DEFAULT, fd); /* exit(134); */ } diff --git a/malloc/src/free.c b/malloc/src/free.c index c5f53356..7db65b74 100644 --- a/malloc/src/free.c +++ b/malloc/src/free.c @@ -41,12 +41,14 @@ void free(void *ptr) t_node *node; ft_putstr(FG_YELLOW"free("); - ft_putaddr(ptr); + ft_putnbr_hex((long)ptr); ft_putendl(")"FG_DEFAULT); if (!ptr) return ; node = ptr - HEADER_SIZE; get_zones(&zone_ref, &alloc_ref, node->size); + ft_putstr("zone @"); + *zone_ref ? print_node(BG_MAGENTA, *zone_ref) : ft_putendl(" NULL"); if (remove_node(alloc_ref, node)) { error_free_notalloc(ptr); diff --git a/malloc/src/get_zones.c b/malloc/src/get_zones.c index 52c1f65c..65ed3eab 100644 --- a/malloc/src/get_zones.c +++ b/malloc/src/get_zones.c @@ -31,6 +31,4 @@ void get_zones(t_node ***zone_ref, t_node ***alloc_ref, size_t size) *zone_ref = TINY(size) ? &tiny_zone : &small_zone; *alloc_ref = TINY(size) ? &tiny_alloc : &small_alloc; } - ft_putstr("zone @"); - **zone_ref ? print_node(BG_MAGENTA, **zone_ref) : ft_putendl(" NULL"); } diff --git a/malloc/src/node_lib.c b/malloc/src/node_lib.c index f1fe4216..80dfc51e 100644 --- a/malloc/src/node_lib.c +++ b/malloc/src/node_lib.c @@ -56,9 +56,9 @@ int remove_node(t_node **head, t_node *node) while (*head) { ft_putstr("looking for node; diff=["); - ft_putaddr(node); + ft_putnbr_hex((long)node); ft_putstr(","); - ft_putaddr(*head); + ft_putnbr_hex((long)*head); ft_putendl("]"); if (*head == node) { diff --git a/malloc/src/show_alloc_mem.c b/malloc/src/show_alloc_mem.c index ec7797e8..44b16495 100644 --- a/malloc/src/show_alloc_mem.c +++ b/malloc/src/show_alloc_mem.c @@ -23,9 +23,9 @@ void print_node(char color[7], t_node *node) { ft_putstr("\t"); ft_putstr(color); - ft_putaddr(node->data); + ft_putnbr_hex((long)node->data); ft_putstr(" - "); - ft_putaddr(node->data + node->size); + ft_putnbr_hex((long)node->data + node->size); ft_putstr(FBG_DEFAULT" : "); ft_putnbr(node->size); ft_putendl(" bytes");