jack/42-archive
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

it compiles

Browse source
This commit is contained in:
Jack Halford 2017-10-08 18:17:17 +02:00
parent 555844379d
commit a8fe30763e
6 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
malloc/.gitignore vendored
View file

@ -1,3 +1,6 @@
myprogram myprogram
*.o *.o
libft_malloc_*.so libft_malloc_*.so
libft_malloc.so
tests/*
!test/*.c

1
malloc/Makefile
View file

@ -35,7 +35,6 @@ free.c\
ft_putchar.c\ ft_putchar.c\
ft_putnbr.c\ ft_putnbr.c\
ft_putstr.c\ ft_putstr.c\
get_zone.c\
hexdump.c\ hexdump.c\
malloc.c\ malloc.c\
node_lib.c\ node_lib.c\

3
malloc/includes/malloc_internal.h
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */ /* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/02/17 23:00:24 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_fd(long n, int fd);
int ft_putnbr_hex(long n); int ft_putnbr_hex(long n);
int ft_putnbr_hex_fd(long n, int fd); int ft_putnbr_hex_fd(long n, int fd);
int ft_putnbr_loop(long n, int base, int fd);
#endif #endif

2
malloc/srcs/ft_putnbr.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */ /* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/10/07 17:07:00 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 */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

2
malloc/srcs/hexdump.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */ /* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/10/07 15:44:13 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 */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

3
malloc/srcs/malloc.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */ /* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/02/17 12:28:02 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; t_node *node;
void *ret; void *ret;
g_malloc_debug = 1;
if (g_malloc_debug >= 1) if (g_malloc_debug >= 1)
DGSN("malloc called with size", size); DGSN("malloc called with size", size);
if (g_malloc_debug >= 2) if (g_malloc_debug >= 2)