diff options
Diffstat (limited to 'common/common.c')
| -rw-r--r-- | common/common.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/common/common.c b/common/common.c index face0b5..62fd382 100644 --- a/common/common.c +++ b/common/common.c @@ -6,44 +6,44 @@ /* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/02/08 23:12:55 by cacharle #+# #+# */ -/* Updated: 2020/02/15 00:54:03 by cacharle ### ########.fr */ +/* Updated: 2020/09/30 07:56:12 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ #include "common.h" -t_bool parse_args(t_philo_args *philo_args, int argc, char **argv) +bool parse_args(t_philo_args *args, int argc, char **argv) { if (argc != 5 && argc != 6) - return (FALSE); - if ((philo_args->philo_num = h_strtoposint(argv[1])) == -1 || - (philo_args->timeout_death = h_strtoposint(argv[2])) == -1 || - (philo_args->timeout_eat = h_strtoposint(argv[3])) == -1 || - (philo_args->timeout_sleep = h_strtoposint(argv[4])) == -1) - return (FALSE); + return h_err(false, "Usage: %s philosophers_num death_timeout eat_timeout sleep_timeout [meal_num]", argv[0]); + if ((args->philo_num = h_atou_strict(argv[1])) == -1 + || (args->timeout_death = h_atou_strict(argv[2])) == -1 + || (args->timeout_eat = h_atou_strict(argv[3])) == -1 + || (args->timeout_sleep = h_atou_strict(argv[4])) == -1) + return (false); if (argc == 6) { - if ((philo_args->meal_num = h_strtoposint(argv[5])) == -1) - return (FALSE); + if ((args->meal_num = h_atou_strict(argv[5])) == -1) + return (false); } else - philo_args->meal_num = -1; - return (TRUE); + args->meal_num = 1; + return (true); } -void philo_put_state_change(int id, t_philo_event event) // not correct for philo3 +void philo_put(size_t id, t_philo_event event) { h_putnbr(h_time_now()); h_putchar(' '); h_putnbr(id); if (event == EVENT_FORK) h_putstr(" has taken fork\n"); - else if (event == EVENT_EATING) + else if (event == EVENT_EAT) h_putstr(" is eating\n"); - else if (event == EVENT_SLEEPING) + else if (event == EVENT_SLEEP) h_putstr(" is sleeping\n"); - else if (event == EVENT_THINKING) + else if (event == EVENT_THINK) h_putstr(" is thinking\n"); - else if (event == EVENT_DIED) + else if (event == EVENT_DIE) h_putstr(" died\n"); } |