From a8fe30763e6e1c17ce47a112d0ef1c17e8a62006 Mon Sep 17 00:00:00 2001 From: Jack Halford Date: Sun, 8 Oct 2017 18:17:17 +0200 Subject: [PATCH] it compiles --- malloc/.gitignore | 3 +++ malloc/Makefile | 1 - malloc/includes/malloc_internal.h | 3 ++- malloc/srcs/ft_putnbr.c | 2 +- malloc/srcs/hexdump.c | 2 +- malloc/srcs/malloc.c | 3 +-- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/malloc/.gitignore b/malloc/.gitignore index 1b9129a7..16b8625d 100644 --- a/malloc/.gitignore +++ b/malloc/.gitignore @@ -1,3 +1,6 @@ myprogram *.o libft_malloc_*.so +libft_malloc.so +tests/* +!test/*.c diff --git a/malloc/Makefile b/malloc/Makefile index 0ab56846..73bd761a 100644 --- a/malloc/Makefile +++ b/malloc/Makefile @@ -35,7 +35,6 @@ free.c\ ft_putchar.c\ ft_putnbr.c\ ft_putstr.c\ -get_zone.c\ hexdump.c\ malloc.c\ node_lib.c\ diff --git a/malloc/includes/malloc_internal.h b/malloc/includes/malloc_internal.h index 15e6a775..a3805e3e 100644 --- a/malloc/includes/malloc_internal.h +++ b/malloc/includes/malloc_internal.h @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/02/17 23:00:24 by jhalford #+# #+# */ -/* Updated: 2017/10/07 17:08:37 by jhalford ### ########.fr */ +/* Updated: 2017/10/08 18:16:21 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ @@ -121,5 +121,6 @@ int ft_putnbr(long n); int ft_putnbr_fd(long n, int fd); int ft_putnbr_hex(long n); int ft_putnbr_hex_fd(long n, int fd); +int ft_putnbr_loop(long n, int base, int fd); #endif diff --git a/malloc/srcs/ft_putnbr.c b/malloc/srcs/ft_putnbr.c index c8028fc6..eeb243dd 100644 --- a/malloc/srcs/ft_putnbr.c +++ b/malloc/srcs/ft_putnbr.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/10/07 17:07:00 by jhalford #+# #+# */ -/* Updated: 2017/10/07 17:08:25 by jhalford ### ########.fr */ +/* Updated: 2017/10/08 18:15:49 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/malloc/srcs/hexdump.c b/malloc/srcs/hexdump.c index 60580a61..5316cc84 100644 --- a/malloc/srcs/hexdump.c +++ b/malloc/srcs/hexdump.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/10/07 15:44:13 by jhalford #+# #+# */ -/* Updated: 2017/10/07 17:09:29 by jhalford ### ########.fr */ +/* Updated: 2017/10/08 18:16:02 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/malloc/srcs/malloc.c b/malloc/srcs/malloc.c index d1761251..777123b7 100644 --- a/malloc/srcs/malloc.c +++ b/malloc/srcs/malloc.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/02/17 12:28:02 by jhalford #+# #+# */ -/* Updated: 2017/10/07 17:10:38 by jhalford ### ########.fr */ +/* Updated: 2017/10/08 17:29:52 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ @@ -61,7 +61,6 @@ void *ft_malloc(size_t size) t_node *node; void *ret; - g_malloc_debug = 1; if (g_malloc_debug >= 1) DGSN("malloc called with size", size); if (g_malloc_debug >= 2)