From 836c02f3f56b2e00fa88763f4f26da9c1fc15948 Mon Sep 17 00:00:00 2001 From: Hugo LAMY Date: Thu, 27 Jan 2022 15:08:56 +0100 Subject: [PATCH] protection segfault creation zero philosophs + deplacement fichiers dans philo + ajout exeption philo folder dans gitignore --- .gitignore | 1 + Makefile => philo/Makefile | 0 {headers => philo/headers}/philo.h | 0 {headers => philo/headers}/philo_macro.h | 0 {headers => philo/headers}/philo_proto.h | 0 {headers => philo/headers}/philo_struct.h | 0 {srcs => philo/srcs}/exec.c | 0 {srcs => philo/srcs}/generic.c | 0 {srcs => philo/srcs}/init.c | 5 +++-- {srcs => philo/srcs}/launch.c | 0 {srcs => philo/srcs}/main.c | 0 {srcs => philo/srcs}/utils.c | 0 12 files changed, 4 insertions(+), 2 deletions(-) rename Makefile => philo/Makefile (100%) rename {headers => philo/headers}/philo.h (100%) rename {headers => philo/headers}/philo_macro.h (100%) rename {headers => philo/headers}/philo_proto.h (100%) rename {headers => philo/headers}/philo_struct.h (100%) rename {srcs => philo/srcs}/exec.c (100%) rename {srcs => philo/srcs}/generic.c (100%) rename {srcs => philo/srcs}/init.c (96%) rename {srcs => philo/srcs}/launch.c (100%) rename {srcs => philo/srcs}/main.c (100%) rename {srcs => philo/srcs}/utils.c (100%) diff --git a/.gitignore b/.gitignore index eaadb6e..b8a14e7 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ Thumbs.db *.lnk *.zip philo +!philo/ diff --git a/Makefile b/philo/Makefile similarity index 100% rename from Makefile rename to philo/Makefile diff --git a/headers/philo.h b/philo/headers/philo.h similarity index 100% rename from headers/philo.h rename to philo/headers/philo.h diff --git a/headers/philo_macro.h b/philo/headers/philo_macro.h similarity index 100% rename from headers/philo_macro.h rename to philo/headers/philo_macro.h diff --git a/headers/philo_proto.h b/philo/headers/philo_proto.h similarity index 100% rename from headers/philo_proto.h rename to philo/headers/philo_proto.h diff --git a/headers/philo_struct.h b/philo/headers/philo_struct.h similarity index 100% rename from headers/philo_struct.h rename to philo/headers/philo_struct.h diff --git a/srcs/exec.c b/philo/srcs/exec.c similarity index 100% rename from srcs/exec.c rename to philo/srcs/exec.c diff --git a/srcs/generic.c b/philo/srcs/generic.c similarity index 100% rename from srcs/generic.c rename to philo/srcs/generic.c diff --git a/srcs/init.c b/philo/srcs/init.c similarity index 96% rename from srcs/init.c rename to philo/srcs/init.c index 37bfba1..0baf729 100644 --- a/srcs/init.c +++ b/philo/srcs/init.c @@ -6,7 +6,7 @@ /* By: hulamy +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/01/26 15:30:34 by hulamy #+# #+# */ -/* Updated: 2022/01/26 18:15:42 by hulamy ### ########.fr */ +/* Updated: 2022/01/27 15:01:30 by hulamy ### ########.fr */ /* */ /* ************************************************************************** */ @@ -50,7 +50,8 @@ static t_philo *init_chain_philo(t_params *params, t_global *global) philo = tmp; i++; } - philo->next = start; + if (philo) + philo->next = start; return (philo); } diff --git a/srcs/launch.c b/philo/srcs/launch.c similarity index 100% rename from srcs/launch.c rename to philo/srcs/launch.c diff --git a/srcs/main.c b/philo/srcs/main.c similarity index 100% rename from srcs/main.c rename to philo/srcs/main.c diff --git a/srcs/utils.c b/philo/srcs/utils.c similarity index 100% rename from srcs/utils.c rename to philo/srcs/utils.c