From caeece4f4635fd73a55cdd06490e8afdbabc7410 Mon Sep 17 00:00:00 2001
From: Khena BRUNEAU <khbruneau@iutclinfa2206l.iut.local>
Date: Fri, 16 Dec 2022 11:34:42 +0100
Subject: [PATCH] Maj de la partie 2

---
 Partie_2/exe         | Bin 17048 -> 17080 bytes
 Partie_2/partie2.c   |  34 ++++++++++++++++++++--------------
 Partie_2/prototype.h |  21 +++++++++++----------
 Partie_2/test.c      |   2 +-
 4 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/Partie_2/exe b/Partie_2/exe
index 5331f408a7abc42fa046f3970edaf4123b804d79..a418da0596ed2b69c5a76aa743c48175e0830def 100755
GIT binary patch
delta 1506
zcmZWpZAe>J7(VAF)WkMzzG{-z%^PV@2lZ=dVx~66dCLtr=Q`b_DA;{C`$J8wcf;0_
zf$88b%jSB@aHEVeq*(T+UACdFU^Yk7eL-8=;Wl9vHn^0IC6>Yprf2WTy^Za5;oRq(
z_j%suyyrbPnLdH%PT;9Z-0*(Y@5LrP%0DJOvEpjuGN&$=Nf<A>CwO)BUmR1zXpB^G
zpV}W^neNJ+i5^Ss|8TJF)b+D<_ltf=D%^r;+W{RyV#0I>OvOa=6>`D+S8&k@$;#|~
zN<~@tM~uUe)5>K^X)HBX0y1GM@PoiFVy66<DVZwqj9HWoWYtn1r6wSp4~RGtCvO{Q
zq=iNrXrz`#DrtnL5hsn9X~aNll_KyFC%^5S`fjOPl>dwiW-zN16Ww<C5^R_Tw>fqq
z<wlOuslL1jEc-?I_^d3=faLRn<TH>&#e{HPoJ{G(eEvd#{1V6wF0H(tUpJpF2&4^x
zQ%ycz;Km=}(n<i<Y2h|2OiT+IhH+tLGKJ-K*gY=H=1(nUsH9NoCY6?{bcITnsg$D9
z9F@+qw)U_d!O5Z3vn)kz03@2z!a8$QT*Pg&_vM&Q7BZm8u)HX&wQeb2!PU&MtLR%A
zsNPl<V`*q$D)eG|qB-~kLZKJJ^3S2}uzWYv6_VGx#l-Gf2tVImm17kuPbS~C`L>+o
zt-Cs;p`~-9BfPP5bm`pi$PjPr7#TvIS9qi62ph#<OgeZEK0==5o#Z{fD2nh-U1J2|
z&?YqVH>DQ=^%+Y40JH<X19%URokpLfv=k~W0c-+{0rmp^1ULb>26!6q$2IT)G~A(d
z1#lPOI$#X24Zc-7c(Df`CH3wS{3Z#zYw%4n?yhh-p#+1<=HI38?uBue%)84#^NYJI
zdJQzgj16ryzr{Um+Qc2&QUpm%dl3c?<%S>O+Y0;&#KXXQ9_IV=bUuF_;vK;M`Y_Mk
zDCC!7q(g=*IZ(c1QxiK{mK=p?FHHF?`KY|rI0MrLXar7Pwe8$Yl-&)S-kvP4zN7;r
zx9Y0#1i|&&byk#NnA}(YJ;v9G#rp;jvbO^NMlN{EIAkZ+yzjD<m-dWqw<7q_T3Jm{
zz6$6pS@k+xU%+-2&WXepEv&&e1p6FySAk`@XKZS?Ph(fLxTwXOwD>Jz+2g3nY3#7J
zW4;-nFv8t2x04oCK1^hvA6v-RK8Ncujf-iHX3epjWPJ|Y$lk7Y(6CxNTQpLG9`c;u
zp&tbn+F-Mygyt32_V*;m{h#3Cg98JHULHL7+N)h;N8kgp5ZJ#Fs!MKuDvXmojr}@&
zn9T33Db{OW8FX-M?>>Bt1cEh||NYUDafoJkwU7s>B<F)c4)f$*$ZwqXtK>8ZwEA%^
IIow+DFJ33(D*ylh

delta 1488
zcmZWpZERCj7(VB=jupDm+s?IfB)fNnY$LL-bn6%^Ylk(rVZkDHfWd?hJ239cvdLni
zRR_kKQ8IWnPU0UDf}p?fCfKNCO}1>qgoF^X45QK?QyVj}OilPPxW4C}+quY1&wbwW
zJkR@{_ndRn)G0cCijGxN&)J%LYj0YJ@!Yh4lh)dD0-xp}Oef@&#ApA<9!`@Us1d#_
zIrDmWX`S}f4a=rWf@SGN->uNKi&|FrrfB^$SX@aKX;@TA`p4m_<BuJRI+U64V1ew#
z$GWblp@+&S4s|9wrR)01^k6AkgT<)7iuwd)&hyO4T%*y9qB`Iwu`xlJr38hs8<SB*
z{Y4pBloa*ttU9!S1<FxPu`aVTpF5JaD(W<9@{0Bp(~|zu72?h#bD@#6hnxQ{$`_hv
zTGGFUn-f_2^SnDb&|<WgRJ<G`^#+clpAD-yUT9&Z(3qJv6KG={8qS$OfW@Psg=B;>
zMs?t3+0kSbb&j3RY1XTXQ>1XmO?=Canb0yz%<krLZZx`#jvUYV)g&3iYJ3atxJql+
zR|H6KZ)eh<*i1;UE3D21qha-*;7dVuIjSVL3?RLyv*r<=Xkqra_Pwjw4g&>&bCT1~
zmLg==Q19fGc)w(mBJs&9ef_-{?K0nkvEzJpI3APU?2io%<Ftz*fdi5UUXbj<<|FX3
zBqu_BgYno~QV(YI^|QQIiEQeY@;_XNmRq*5Z_SS5*q^%2ZgdtggE)`)A>#F%u0Lcv
zq6fd09}rs*J0Ix!KE$Jl!-)HqbbTE0Bg7QqWf6mU3=03!b;<bb;l5N!6%ge*dKrRp
zRaxe~t`}nM{Idar130e3dvXPOF31&$^Vmn68G^-*4}={>1wyZV4JI+~cQ_VNFJG;9
z8M2}Oi2QG;KUl2`i!1rd$fs~WZL9SY|K)F>WFxtQ2FGf{PHuP(xi;M2Y!2S9?6950
zFoRaAi6xeGkloTEOu4km+Gz_S{N7MYQ$QP^wmM0*tTi_NOz9$s-V?~G-YR+vu6iqk
zv<q%~&oKYtrZ_BkOXwFso895Bv9?IC35oSVh?N7GM&3z^$w3z<UNQMOlXsZBu|L%A
zf!O4(Su)iMC$}4?gW+S7KPPfN4i}nz4F!004pK%U0nX;%PUP9zo#q<G5uxY?+2<~+
zH&xuO@fbIRQLCZuL{$_#Pt@ECyM1o!8>r&ZxU^4vpHbMp^<&$i?(Wx)96NM02Di8F
z(dt_j3K7Ao4R1SWp$%|%d)?Y8vkN>rXZ!Q?8tiYc6QB57g-?;KmU&BgoYn5Ow+plo
W$~t_ucYRzu4f{KM)DCAms{RG?EX9}r

diff --git a/Partie_2/partie2.c b/Partie_2/partie2.c
index fc7a2d7..5b1d043 100644
--- a/Partie_2/partie2.c
+++ b/Partie_2/partie2.c
@@ -10,7 +10,7 @@ bool vide(Liste l)
     return l==NULL;
 }
 
-Liste inserer(Liste l, Candidat *can)
+Liste inserer(Liste l, Candidat can)
 {
     Maillon *m;
     m=(Maillon*)malloc(sizeof(Maillon));
@@ -19,32 +19,38 @@ Liste inserer(Liste l, Candidat *can)
         printf("Pb malloc\n");
         exit(1);
     }
-    m->c=can;
+    m->c=&can;
     m->suiv=l;
     m->h=m->h+1;
     return m;
 }
 
-void affichage(Liste l)
-/*affiche la liste des candidats*/
+void affichageT(Liste l)
+/*affiche la liste de tous les candidats*/
 {
-    printf("Numéro \t Prénom \t Nom \t Notes \t Nombre voeux \t Voeux\n");
-    
+    printf("Numéro \tPrénom \tNom\n");
+    affichage1(*l->c);
+}
+
+void affichage1(Candidat c)
+/*affiche les informations d'un candidat*/
+{
+    printf("%d \t%s \t%s\n", c.numC, c.prenom, c.nom);
 }
 
 Liste inscription(Liste lCand, int nbInsc) 
 /* inscript un candidat en rentrant toutes ses informations*/
 {
-    Candidat *c;
+    Candidat c;
     printf("Veuillez rentrer votre prénom : ");
-    scanf("%s", c->prenom);
+    scanf("%s", c.prenom);
+    printf("%s\n", c.prenom);
     printf("Veuillez rentrer votre nom : ");
-    scanf("%*c%s", c->nom);
-    printf("Entrez les notes : ");
-    scanf("%f %f %f %f", &c->lNote[0], &c->lNote[1], &c->lNote[2], &c->lNote[3]);
-    c->nbChoix=0;
-    c->lChoix=NULL;
-    c->numC=nbInsc + 1;
+    scanf("%s", c.nom);
+    printf("%s\n", c.nom);
+    c.nbChoix=0;
+    c.lChoix=NULL;
+    c.numC=nbInsc + 1;
     lCand=inserer(lCand, c);
     return lCand;
 }
\ No newline at end of file
diff --git a/Partie_2/prototype.h b/Partie_2/prototype.h
index dcb3c0d..d00c749 100644
--- a/Partie_2/prototype.h
+++ b/Partie_2/prototype.h
@@ -3,6 +3,14 @@
 #include<string.h>
 #include<stdbool.h>
 
+typedef struct
+    {
+        char ville;
+        char dpt;
+        int chDpt;
+        int chCand;
+    } Choix;
+
 typedef struct
     {
         int numC;
@@ -10,17 +18,9 @@ typedef struct
         char nom[20];
         float lNote[4];
         int nbChoix;
-        struct Choix *lChoix;
+        Choix *lChoix;
     } Candidat;
 
-typedef struct
-    {
-        char ville;
-        char dpt;
-        int chDpt;
-        int chCand;
-    } Choix;
-
 typedef struct maillon
     {
         Candidat *c;
@@ -30,7 +30,8 @@ typedef struct maillon
 
 /*Implémentation liste*/
 Liste listenouv(void);
-void affichage(Liste l);
+void affichageT(Liste l);
+void affichage1(Candidat c);
 void global(void);
 
 /*Reste*/
diff --git a/Partie_2/test.c b/Partie_2/test.c
index bf459b8..54b1a22 100644
--- a/Partie_2/test.c
+++ b/Partie_2/test.c
@@ -6,7 +6,7 @@ void testInsc(void)
     int nb=0;
     l=listenouv();
     l=inscription(l, nb);
-    affichage(l);
+    affichageT(l);
 }
 
 int main(void)