From fa2f465ef6a12d3aa0c92b847145b9ac286de9ba Mon Sep 17 00:00:00 2001 From: "matheo.thierry" Date: Sat, 17 Dec 2022 11:47:51 +0100 Subject: [PATCH] MODIF chargement complet et fonctionnel --- sae | Bin 17288 -> 17192 bytes sae1-02.c | 8 +++++--- sae1-02.h | 4 ++-- sase | Bin 0 -> 17192 bytes 4 files changed, 7 insertions(+), 5 deletions(-) create mode 100755 sase diff --git a/sae b/sae index 5fbf1920bdb251a887cb91cb262fbcb017b8e377..4c1c4285fd0194acdc69888c5c0e4967f52c27b4 100755 GIT binary patch delta 3118 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 delta 2959 zcmZ8j3v5%@89v936FVfqH((q?Dqr&$&)9Lug9IGgd5mk6qEN_|ZUvl%RB=c1!Wo$c za?+H?U1rtrr&3i=S1Mp>t4*D}O{H4Zgd#GwX&n>o)GcfYqN*pd%`i4GNPG96bMG~f zb9K*m&iDW4JO6p!J9d;FKSmQph2vJjQ$Ph`-g08yd5bkity)2#i%!fI=Uz9d#B~!C zQn#hks8%~6L_L;4gIYTdL-d$yN>pp}@sLWBL$KEH&f=BP*MIy@*Yw2^U**Bk^_xb2 zn3!1uDZ@%zKDtqSv$^{a&-1}$TulWyVYJg2v|%o?GDyZETFO}m&!6P^Deh6l%h@ak zF{_Ba&DmPmkyVt{F%XGDXVyeL3*1Ny+Cv^eisij%)uxBoBN2?uNFo~7zcgZD{s*Af zWcR)y@Hk1@r=nQ}64v-|U>*+_Oy7nL*?IZ*{HlcwHy=u}llje>FI$2I$(ig2=9AVp zV{dy1>15R3dlXEo>ahM?0_!|^{}Ga}?vdmh((ui6^RA}2>3$X=Qam3x_$JUxvHjOg z$lZm`24?Z~qJR`PJBxB0qD(Jz4l?17G?a4Vz94T*v&*1xl)9`{3P79(( zlKZDWY)0?Y`L7g3k{jcm+WZ zNuGQU%_Oye35=k?NJ~nRn=Zxy!1q@h{1Y#7IJ9Q2_4${{pr-Q!@#@(5AKadD21<2a7*6p}2Oj~Rv0;@qT3 z{~~lhf|k?(((j>)a%;U5Z<*!c$17e{8>wQAs#scDi!x7RWu$R7GbvUKMw{;f)NE&( ztLDIL+mQG10zI7kISANR8_qs}h;2>mlMMgv111)bFJsFq8TK{KHgI+_!@k5>iL(SFe9Vg)Z_BOCC@mAY$q2CYmwq5VWf99t^E==fH~EEKl$4w6_#W=yOf?3&CV?@vFBOw zg|_|syW7P`m)Q1vcYm~_uf44=+9A4XAxB)5^K5q)vVE{#tc0YvGe(ygHxJ+{;=Usd z|5B7oh}RHj5pN=nB3?-=N*3AFcNAp|vGm`H@@vG4 zh$%$>T}3hD1vQGe0r4(k6mc;jFzkAQN^r*IF%A3^rwKlBt#C|ZNxyfnds2+=Gx&Z0 z!g44533!(~W3OUt$Cxo#U_EN6&(Aizn3sc%nD4LfRnWfuF?)#HMdYUNEx|FQ9q__zRp&N{^Obs-vg+z33@B-jxTUxL{dar1G>J7yWn=Yop!N26hj}T@JgX--jA$TKykty=Hg{b(sJBvG39J&uRMlE^6mIfj?CWj(*K2Pn*w^nr4he=t!WI zjc&g3X*f}3cl=Uodw7xBh@V0%UWSP(yD+0!w`wc6J$bdNjOInU4s`Ts*B#7cIl)!k z3d7Y6aIJc~us?Dj+TPh68Q9m+6a8*vUkA8q+*bDc6xiAns;l2y<}Pzr!1kJ_Ec+vU z9resL`JfsnNbp79k64cecjj>RDRJeIJ=hGD{2 zWl3nY1kl>5%=y&M={SUHV`lbIWeIv~?eImd0Gs?)F#Ah0f4KT82`1R)cjxL`4^QEX z{;wPULf|)kw=gAg5u)QEumn7XtuB?-(P~I;3)E6Pta8v}(Kli%Oa!Ye`qFd)t@Gp2 f4A%KAiBh%wAjox97V9Rpb_=f5RnZ4P>sS9DCl3~q diff --git a/sae1-02.c b/sae1-02.c index 96effad..022f442 100644 --- a/sae1-02.c +++ b/sae1-02.c @@ -114,7 +114,7 @@ Listchoixdept ensemblevide(void){return NULL;} Listchoixdept lireCarte(FILE *fe, int nbchoix){ if(nbchoix==0){return NULL;} Maillonchoix* cc; - cc = (Maillonchoix*)malloc(sizeof(Maillonchoix*)); + cc = (Maillonchoix*)malloc(sizeof(Maillonchoix)); fscanf(fe, "%s %s %d %d", cc->Ville, cc->dep, &cc->decision, &cc->validation); cc->suivant = lireCarte(fe, nbchoix-1); return cc; @@ -130,17 +130,19 @@ listetuinfo lireEtu(FILE *fe){ int chargeretudiant(char nomFich[], listetuinfo *tetu[], int tmax){ int i=0, nbetu; listetuinfo a; + Listchoixdept b; FILE *fe; fe = fopen( nomFich, "r"); if(fe==NULL){printf("\n");return-1;} fscanf(fe, "%d", &nbetu); - *a.carte = ensemblevide(); + b = ensemblevide(); for(i=0; i");fclose(fe);return-1;} tetu[i] = (listetuinfo*)malloc(sizeof(listetuinfo)); if(tetu[i]==NULL){printf("\n");fclose(fe);return-1;} a = lireEtu(fe); - *a.carte = lireCarte(fe, a.nbchoix); + b = lireCarte(fe, a.nbchoix); + a.carte = b; *tetu[i] = a; } fclose(fe); diff --git a/sae1-02.h b/sae1-02.h index 6881ccb..5ccfbd8 100644 --- a/sae1-02.h +++ b/sae1-02.h @@ -41,7 +41,7 @@ typedef struct{ char prenometu[21]; int notes[4]; int nbchoix; - Listchoixdept* carte; + Listchoixdept carte; }listetuinfo; // Partie 3 @@ -60,4 +60,4 @@ typedef struct listatt{ struct listatt* suivant; }maillonatt; -void test1(void); \ No newline at end of file +void test1(void); diff --git a/sase b/sase new file mode 100755 index 0000000000000000000000000000000000000000..666f229b646f74ad6b0485cc12886a00af243633 GIT binary patch literal 17192 zcmeHOeQ+Dcbzczrpk)iBWZ9-a8o{bPma7l~6^o*zClM zoS|D;*WcUS2Of@KGSffuM+ZyZy?wv;vAb{g4!3u^Uyt7M9FTUG))yk zVk&ey$ZjzSH1DR%my%EjrYx_N=a*t3Tr@)sL1OB(qpFl!rC5}=RnrmO?omzIj##pr z)poPmj_EX22#G1jlVU>08ST$ayT}NMDd|$`d&i1VzVUX+&ZCxs1yi>B0_=3CwZ?BJ z9QNJ1yoKV@qU+C8H&?7rCJwdVvpyMXO(s(Lk=Bup_SW`$0=aZxgKYOI6i;2TbJt!m z_U1G1tlRbSz_}Bj8vW|qUtBhM{Xd+ddQ%<9AL&pceGWg->u``FXhdXTs zu*MA%KakGEQzDbMa&+n+ie^P7n@Cv$!ZZ`PbpPhf=0L7Lni>!T{mFDLE{3DYWV#>H z{*kCTkVr+7i6e2a7zq7l&WdI&b2yqv3F2uSw2PfR-JRRb4S`LS+=jqLVRrB7HDmE? zd@zx-;@LgD+mq>3d{6XHlDrKLr&HRSsZ?t!q5(8Qyf~{r;t8RHk_Wj5KzW?slt?Tm z{g}q`wP>(=80`3SHW0x9@;^JSd7s5Dp%4)FB z8)Ii0rz&dp#)9Mg%#1D~tX4*!&^WTW4N5Gl$lK(03^e8%WO7j0qJUt4| zoRs{JiKj=vnF-0iKs-JA&5TR_?}(>IzL`0G4qm3V|LQKh_MlOC+ZelWxo=NT zY4H~58l~kwgA1dy?KHIP8zQCgfOvU%3J0nPno0C_a`8hg5F^(Z-> z(iASbrT)fFB6nXk3YU%3@7-&hp7k1@v&L&ztyOUFL+zl^o*t0pu>I(^YhWkx>-QRC z+n$D&FbeNj*BQla?}90}qDkc;oX#$O3%ut5+cBMa7{a}E{7fO9L=@edvpnM!vl2(OIgS@;dD|A1qF@$QIFber`qZFCwDTRVW zQRvNz8jFn5-U*mMo}Vzr&W85s%x5{%!I^vZ^%hQd7f|Jmk6`9hsnB;mLE&R({P1$Z zDE7kJfk~s#XcYEi-1eRX`@B&wn!&e#KL!33@QBa;wcyW#e*=6Fd>HJejaxA%-3;cAP8@wtZ6juqOw!5J_RkRZ}~RaWnNv%Ob|B3$fd2vsObD% zaQaU$Q#L=6Ht>bQCn}}ftSpQZMrqZ{x~5cnqjX!tOML*!-z2+&7jEY(c@QPK9P(>W z)WcN&c1I~&Dy95Ag`gA}#aKZ3a%g;r_80f6sH24n+%JRj+sZ2T!pVW-bNx6D76Yl$ zj}zc09sS7t%>AfJ)crUXx#THE-rO9y)bzv|3MIuF@frOe8p{YhcQHmR2FlS{^wzA% z`_S5xnCq4e=v_?1YPM*|%ca;CBF-pfRuc^uUMak06h1HtXJPVFOfOYm1YsxjiXnr- zx3a>Z@Fx)di?_V=X$t z@qjgAVTdDMMx#+Gog@vV_`>n)Y4HDqLOg}RfqTul$Q2rO7dI6nS1`VckG)L#cE+$X zAv@DyXM%QSt)21PnHD?KY-bwnVEGg3sj)MCW05Q9y(?QIvyYq}AAfafAkeh>G4dvV zZ^B>fDQ&y=E+NAEx(ly|_jVUP3hxOQuIx2RtwF%|_uTyn{f3o4^D*3={={qD+V=CN z)uN~HK~LemuEKwY?N$G7j7@or&A-UMOTTSjIuQPH_(1rP>;a>%LveSD@u3f{PZ8gzo7FRt3blD(EIG|{>&kNI{#2SYvC!; zKal7jO2o7NM9NR!^ak;r&C16T(Uj%C{d4dnoh!R|HXF}p=UX@pw14&OZvm%A;dYs< z;4*w9w1%dh#X0e(`M7@zYPn1dWTUC6A4C&5%|}y%$vKX6rzTPJTxRN7t%3S^ZuM@Z zZ`_!Aik4s5_9@U4pk>fWP&kwskp1M#YqVT^gbuY05t)ngH4Z6Db7Um#!6X((0XcR>C<$d6XZM=J6z z@{K1>H{$b`7Daq(pIF@G3qHQY@O6wW-RTQ` z#n%z`1;f6zoj!l3uLb&@zDD^S_;2860)D8tda6gD9)WrU>Jg|%pdNvG1nLo}N8tAv z0bXCo>k0Xp^Z{K7eDzUDKK!eB5CMyBQt-`+RMsuh`c+Cihqy(tg4Zw7b2=rKe{|JO zOI|Mu3GD4Db4$v0K32}p_OthI0A%*Dam6+5DJa3})gp_o% zM29Yz@ey4yuJ)fkxuPE~Xa0t9uDc)Ek;9l$u;Bn_r$NJSJ zYNdh`MBa;4soalFkrzXO`@b5$M)0_*#+OybUp0==?usYLy;z~{uZb@g6E$&PWgkbi z|E9`yU5&$u--)QaSFEV)3vf!kSQ$QgyAxsk>nryOr__tL4}5>9#%~a{#-Uf-D0qEy zwLY%ikP}gPFYXR~HSwFp!J0VVwdQ=$^}0yBZ_gnrNB74D;SR$ho?q-z5<;5@co-~DLsV4Bj(5XDd4s0|E&e^h1&Z)>3^k2 z{vk51RLlQ!Qs?@4{rh9!9^9?n{rfLkpVz^25x1Tewx8XW(pkD`9zbr+= zRw8bEqvtr^Bylcnj;;glpJOYz3lg6{u68cqC%OQhmAFr|uT-wj>k^J={9*lrCf`{> z_6^|87|-r;`{V-t|5E!osmGyw2M0eZ2yd8wz5lh=pVj4lTi55g1^k~`0Dl`e)zf|5 z{Yv})zOE1deqRCZ*JU}$wdltc4K0FyH&{mdfL2iFYNJJ3a2Igu--#O)Am7y?yGi0& z$w6L3z8TluP{;uyOYddL5ASzdr^TO#AJRYQ(%+}ceM+~BhuxPJD0f)v&*%pb`OXq$ zd<{6Y_n^!F7;r!2?(~fIvjl4|D9QJupnnT|jYM3h{;ZX=@&f~belfTC#k7V^?5;`0 zbJ+S4OPhnq^r2|dj9KYy&Wz?qM1OiXlZ;#OSRhzigLdL1%xE?nJ#5BPR`xKxZXb@D zvHbAxVVF2L6Pi|)D(%^8}rOcj>gBooZV-r(cSn-_IrZ+=X zsm$B!Ft%?a6_=MPNzNtEl)dQ86x zdzxc1&+`nXL0yu&{#=10$WTn#p64S>PiaLi-`)Plw0)=6<9RdFNryent=;xd0;8Dd z={Ehis-!8|I1|;?nF?T>_I_>0bkwPgyvx1#rptapD=_8yvK!`^KI5|I=LM!;s5DG@ z;PTm@dY+zZKfhOD%I_Cg-`)Oab@|+X!ml+oUF;fgTyL!Q&-7hLoc1E5RfCH5X_g7wG5rt% zr#(M!_i1~sr`w+SkC7o?T>pb1B{`_=xg3S6vN%ulDh?`Ns}m#>+uy~2rld>BNqOuk zi8>$G4*T>AIQkt5;Nbf3{g52dKe0t=(0tLET&(zC D@4lBJ literal 0 HcmV?d00001