From 692d5ff25faa6c52f95878c45c6ef10b240900fe Mon Sep 17 00:00:00 2001 From: Lola CHALMIN Date: Fri, 13 Jan 2023 14:37:23 +0100 Subject: [PATCH 1/5] 4.h --- part4.h | 1 + 1 file changed, 1 insertion(+) diff --git a/part4.h b/part4.h index 3999697..cab8351 100644 --- a/part4.h +++ b/part4.h @@ -53,6 +53,7 @@ Filechx enf(Filechx fchx, Choix c); Choix def(Filechx fc); Candidat defC(Filecand fC); int chargement (Candidat tCandAcc[], int tmax, FILEfe);// chargement des files cand et chx +Filecand ChargementfileC(Filecand fC, int *nbC);//chargement pour la file d'attente void test (void); From e5fe45fb028105fe432499d2e7c15ff973f15f3b Mon Sep 17 00:00:00 2001 From: Lola CHALMIN Date: Fri, 13 Jan 2023 14:39:16 +0100 Subject: [PATCH 2/5] bien comme il faut --- part4.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/part4.h b/part4.h index 9855d3b..57b2ed1 100644 --- a/part4.h +++ b/part4.h @@ -55,9 +55,6 @@ Candidat defC(Filecand fC); <<<<<<< HEAD int chargement (Candidat tCandAcc[], int tmax, FILEfe);// chargement des files cand et chx Filecand ChargementfileC(Filecand fC, int *nbC);//chargement pour la file d'attente -======= -int chargement (Candidat tCandAcc[], int tmax, FILE *fe);// chargement des files cand et chx ->>>>>>> e32572c7e16bdf2af0d2765fcbeb57f084929d24 void test (void); From 1e90ddedfbb4e9f70672f5cea56a3824599d26f6 Mon Sep 17 00:00:00 2001 From: Lola CHALMIN Date: Fri, 13 Jan 2023 14:39:49 +0100 Subject: [PATCH 3/5] nickel --- part4.h | 1 - 1 file changed, 1 deletion(-) diff --git a/part4.h b/part4.h index 57b2ed1..cab8351 100644 --- a/part4.h +++ b/part4.h @@ -52,7 +52,6 @@ Filecand enfC(Filecand fC, Candidat c); Filechx enf(Filechx fchx, Choix c); Choix def(Filechx fc); Candidat defC(Filecand fC); -<<<<<<< HEAD int chargement (Candidat tCandAcc[], int tmax, FILEfe);// chargement des files cand et chx Filecand ChargementfileC(Filecand fC, int *nbC);//chargement pour la file d'attente From ad199f06d242369621ea8b1a5b183262348339ea Mon Sep 17 00:00:00 2001 From: Lola CHALMIN Date: Fri, 13 Jan 2023 14:57:08 +0100 Subject: [PATCH 4/5] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'part4.h'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- part4.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/part4.h b/part4.h index cab8351..29d8cc0 100644 --- a/part4.h +++ b/part4.h @@ -52,7 +52,7 @@ Filecand enfC(Filecand fC, Candidat c); Filechx enf(Filechx fchx, Choix c); Choix def(Filechx fc); Candidat defC(Filecand fC); -int chargement (Candidat tCandAcc[], int tmax, FILEfe);// chargement des files cand et chx +int chargement (Candidat *tCandAcc[], int tmax, FILE *fe);// chargement des files cand et chx Filecand ChargementfileC(Filecand fC, int *nbC);//chargement pour la file d'attente void test (void); From af37bc690da969f1d0e8777f53ec4d45262c93e6 Mon Sep 17 00:00:00 2001 From: Lola CHALMIN Date: Fri, 13 Jan 2023 14:58:57 +0100 Subject: [PATCH 5/5] =?UTF-8?q?=C3=A9toile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- part4.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/part4.c b/part4.c index 0c39e3b..9920f1d 100644 --- a/part4.c +++ b/part4.c @@ -273,7 +273,7 @@ Filecand ChargementfileC(Filecand fC, int *nbC)//chargement du fichier dans cett return fC; } -int chargement (Candidat tCandAcc[], int tmax, FILE *fe){// chargement des files cand et chx +int chargement (Candidat *tCandAcc[], int tmax, FILE *fe){// chargement des files cand et chx int i, nbCand; Candidat c; Choix chx;