Integrate ft_utils.h into philo.h

diff --git a/philo/include/ft_utils.h b/philo/include/ft_utils.h
deleted file mode 100644 (file)
index 2299cd9..0000000
--- a/philo/include/ft_utils.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* ************************************************************************** */
-/*                                                                            */
-/*                                                        :::      ::::::::   */
-/*   ft_utils.h                                         :+:      :+:    :+:   */
-/*                                                    +:+ +:+         +:+     */
-/*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
-/*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2025/01/17 11:57:44 by dkaiser           #+#    #+#             */
-/*   Updated: 2025/01/21 12:04:07 by dkaiser          ###   ########.fr       */
-/*                                                                            */
-/* ************************************************************************** */
-
-#ifndef FT_UTILS_H
-# define FT_UTILS_H
-
-# include <stdio.h>
-# include <stdlib.h>
-# include <sys/time.h>
-
-/*
-** Prints error message and returns EXIT_FAILURE
-*/
-int            ft_err(const char *str);
-
-/*
-** Returns integer value from str
-*/
-int            ft_atoi(const char *str);
-
-/*
-** Returns current time in milliseconds
-*/
-int            ft_cur_time_in_ms(void);
-
-/*
-** Prints "timestamp_in_ms id str"
-*/
-void   ft_log(int id, const char *str);
-#endif

diff --git a/philo/include/philo.h b/philo/include/philo.h
index bbc1bc28b11df280b77969a146a771b6889883ac..390cadd83467281bb97c74bfc2c1f5cb24e05333 100644 (file)
--- a/philo/include/philo.h
+++ b/philo/include/philo.h
@@ -6,18 +6,18 @@
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/01/17 10:23:19 by dkaiser           #+#    #+#             */
-/*   Updated: 2025/01/26 12:05:33 by dkaiser          ###   ########.fr       */
+/*   Updated: 2025/01/28 13:06:11 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #ifndef PHILO_H
 # define PHILO_H
 
-# include "ft_utils.h"
 # include <pthread.h>
 # include <stdio.h>
 # include <stdlib.h>
 # include <unistd.h>
+# include <sys/time.h>
 
 # define ERR_USAGE "Usage: <nbr_of_philos> <ttd> <tte> <tts> [times_must_eat]"
 # define ERR_MALLOC "Memory allocation failed"
@@ -56,4 +56,24 @@ int                                  run_simulation(int nbr_of_philos, t_philo *philos,
 int                                    philo_die(t_philo *philo);
 void                           philo_eat(t_philo *philo);
 
+/*
+** Prints error message and returns EXIT_FAILURE
+*/
+int            ft_err(const char *str);
+
+/*
+** Returns integer value from str
+*/
+int            ft_atoi(const char *str);
+
+/*
+** Returns current time in milliseconds
+*/
+int            ft_cur_time_in_ms(void);
+
+/*
+** Prints "timestamp_in_ms id str"
+*/
+void   ft_log(int id, const char *str);
+
 #endif

diff --git a/philo/src/ft_utils.c b/philo/src/ft_utils.c
index ba5756d7ab452e620987093f3f8945731fb0dd13..d77ee3ffa732433175bbacead31c497cc12423c7 100644 (file)
--- a/philo/src/ft_utils.c
+++ b/philo/src/ft_utils.c
@@ -6,11 +6,11 @@
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/01/17 11:57:11 by dkaiser           #+#    #+#             */
-/*   Updated: 2025/01/21 12:04:22 by dkaiser          ###   ########.fr       */
+/*   Updated: 2025/01/28 13:04:10 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "ft_utils.h"
+#include "philo.h"
 
 int    ft_err(const char *str)
 {

diff --git a/philo/src/philo_eat.c b/philo/src/philo_eat.c
index e3647ab6dc1f5f91f295eee6442da4c46473736f..3a0208e50a2ad443640b85fa950df11876a98a4e 100644 (file)
--- a/philo/src/philo_eat.c
+++ b/philo/src/philo_eat.c
@@ -6,13 +6,11 @@
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/01/21 18:15:40 by dkaiser           #+#    #+#             */
-/*   Updated: 2025/01/27 14:52:54 by dkaiser          ###   ########.fr       */
+/*   Updated: 2025/01/28 13:05:31 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "ft_utils.h"
 #include "philo.h"
-#include <pthread.h>
 
 static void    take_fork(t_philo *philo, t_fork *fork)
 {