diff --git a/malloc/Makefile b/malloc/Makefile index 2197234c..e7a9693e 100644 --- a/malloc/Makefile +++ b/malloc/Makefile @@ -45,8 +45,7 @@ malloc.c\ node_lib.c\ realloc.c\ reallocf.c\ -show_alloc_mem.c\ -valloc.c +show_alloc_mem.c SRCS = $(addprefix $(SRC_DIR), $(SRC_BASE)) OBJS = $(addprefix $(OBJ_DIR), $(SRC_BASE:.c=.o)) diff --git a/malloc/srcs/calloc.c b/malloc/srcs/calloc.c index 164fca5f..56ae14df 100644 --- a/malloc/srcs/calloc.c +++ b/malloc/srcs/calloc.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/10/22 14:35:06 by jhalford #+# #+# */ -/* Updated: 2017/10/22 17:30:13 by jhalford ### ########.fr */ +/* Updated: 2017/10/22 18:44:24 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/malloc/srcs/interface_extended.c b/malloc/srcs/interface_extended.c index f7d72d1f..523bc67d 100644 --- a/malloc/srcs/interface_extended.c +++ b/malloc/srcs/interface_extended.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/10/22 17:32:51 by jhalford #+# #+# */ -/* Updated: 2017/10/22 17:36:16 by jhalford ### ########.fr */ +/* Updated: 2017/10/22 18:45:28 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/malloc/srcs/malloc.c b/malloc/srcs/malloc.c index 0e7da332..04dfefed 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/22 17:29:44 by jhalford ### ########.fr */ +/* Updated: 2017/10/22 18:45:48 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ @@ -56,7 +56,6 @@ void *ft_malloc(size_t size) t_node *node; void *ret; - g_malloc_debug = 0; if (g_malloc_debug >= 2) show_alloc_mem(); size += M_NODEHEAD; diff --git a/malloc/srcs/valloc.c b/malloc/srcs/valloc.c deleted file mode 100644 index 48f456da..00000000 --- a/malloc/srcs/valloc.c +++ /dev/null @@ -1,13 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* valloc.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: jhalford +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2017/10/22 15:00:53 by jhalford #+# #+# */ -/* Updated: 2017/10/22 17:11:32 by jhalford ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "malloc_internal.h"