[Master] Correction: prepare for correction

Author: Guillaume Pouyat

Makefile

@@ -6,7 +6,7 @@
 #    By: gpouyat <[email protected]>            +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2017/02/05 12:29:27 by gpouyat           #+#    #+#              #
-#    Updated: 2018/09/27 14:30:06 by gpouyat          ###   ########.fr        #
+#    Updated: 2018/10/02 11:39:02 by gpouyat          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 

correction/prepare.py

@@ -6,7 +6,7 @@
 /*   By: gpouyat <[email protected]>            +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2018/09/26 12:26:26 by gpouyat           #+#    #+#             */
-/*   Updated: 2018/09/27 16:19:23 by gpouyat          ###   ########.fr       */
+/*   Updated: 2018/10/02 11:51:26 by gpouyat          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 

correction/run.sh

@@ -1,18 +1,22 @@
-#include "./includes/ft_malloc.h"
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   main.c                                             :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: gpouyat <[email protected]>            +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2018/10/02 12:00:56 by gpouyat           #+#    #+#             */
+/*   Updated: 2018/10/02 12:02:02 by gpouyat          ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
 
-// extern t_malloc_global	g_malloc;
+#include "./includes/ft_malloc.h"
 
-// void	print_one(t_block *block)
-// {
-// 	if (block)
-// 		printf("size = %lu, next = %lx, free = %d\n", block->size, (long)block->next, block->free);
-// 	else
-// 		printf("NO blocks\n");
-// }
- #include <assert.h>
-int		main()
+int		main(void)
 {
-	char *toto = malloc(42);
-	toto = NULL;
+	char	*toto;
+
 	toto = malloc(42);
-}
+	free(toto);
+	return (0);
+}

correction/sources/test0.c

@@ -6,7 +6,7 @@
 /*   By: gpouyat <[email protected]>            +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2018/09/26 18:56:29 by gpouyat           #+#    #+#             */
-/*   Updated: 2018/09/27 15:58:53 by gpouyat          ###   ########.fr       */
+/*   Updated: 2018/10/02 11:56:44 by gpouyat          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -20,9 +20,9 @@ void		*malloc(size_t size)
 	size_t	s;
 
 	ptr_alloc = NULL;
-	init_zones();
 	s = ft_align(size, 16);
 	malloc_pthread_lock(g_malloc.mutex);
+	init_zones();
 	if (s <= TINY_MAX)
 		ptr_alloc = create_alloc(g_malloc.tiny, s);
 	if (s <= MEDIUM_MAX && ptr_alloc == NULL)