From 1fb58179352d27387d0e3563cd7a535d97bd073b Mon Sep 17 00:00:00 2001 From: klmp200 Date: Mon, 18 Jun 2018 16:14:01 +0200 Subject: [PATCH] Toujours un peu de refactoring --- Elevator/Elevator.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Elevator/Elevator.c b/Elevator/Elevator.c index ad2e033..6a74df3 100644 --- a/Elevator/Elevator.c +++ b/Elevator/Elevator.c @@ -31,8 +31,9 @@ void _free__Elevator(THIS(Elevator)){ void add_passenger_Elevator(THIS(Elevator), Passenger passenger){ pthread_mutex_lock(&this->mutex_passenger); this->passengers->insert_tail(this->passengers, ((void *)&passenger), sizeof(Passenger)); - printf("Le passager avec l'id %d est entre dans l'ascenseur %s\nIl y a maintenant %d passagers dans l'ascenseur %s\n", - passenger.visitor->get_id(passenger.visitor), this->name, this->passengers->get_size(this->passengers), this->name); + printf("L'ascenseur %s recoit le visiteur %s\nIl y a maintenant %d passagers dans l'ascenseur %s\n", this->name, + passenger.type == VISITOR ? passenger.visitor->get_name(passenger.visitor) : passenger.resident->get_name(passenger.resident), + this->passengers->get_size(this->passengers), this->name); if (this->passengers->get_size(this->passengers) >= MAX_ELEVATOR_CAPACITY) this->set_state(this, SLEEPING); pthread_mutex_unlock(&this->mutex_passenger);