From bc62da0d35a916a86fab60858428884d8f0a7c36 Mon Sep 17 00:00:00 2001 From: "thibaud.la_riviere-gillet" Date: Mon, 8 Jan 2024 12:56:41 +0100 Subject: [PATCH] le pb etait que initTabTravaux est pas ds le .h car je ne sais pas si on le gardera comme ca --- SAE2 | Bin 0 -> 35496 bytes includes/structures.h | 8 +++++++- obj/charge.o | Bin 0 -> 5264 bytes obj/main.o | Bin 0 -> 1032 bytes obj/sort.o | Bin 0 -> 3080 bytes obj/structures.o | Bin 0 -> 3456 bytes srcs/structures.c | 5 +++++ 7 files changed, 12 insertions(+), 1 deletion(-) create mode 100755 SAE2 create mode 100644 obj/charge.o create mode 100644 obj/main.o create mode 100644 obj/sort.o create mode 100644 obj/structures.o diff --git a/SAE2 b/SAE2 new file mode 100755 index 0000000000000000000000000000000000000000..abb0c725e1063c105e96967e39ca754824bfbcec GIT binary patch literal 35496 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 ZRh+w7{qJKge7NJG^>5b9Kp5xGe*=_SHB0~i literal 0 HcmV?d00001 diff --git a/includes/structures.h b/includes/structures.h index db93ccd..bc8b754 100644 --- a/includes/structures.h +++ b/includes/structures.h @@ -1,4 +1,4 @@ -// on ne nous a pas donner de longueure pour la chaine de char de nomE +// on ne nous a pas donner de longueur pour la chaine de char de nomE // il faudrait utiliser la meme methode que pour adresse typedef struct @@ -47,3 +47,9 @@ typedef struct char travauxPrec[30]; char travauxSucc[30]; } Precedence; + +typedef struct fileAtt +{ + Tache *tac; //Demander si on peut pointeur -> moins lourd + struct fileAtt *nxt; +} ListeAttente; diff --git a/obj/charge.o b/obj/charge.o new file mode 100644 index 0000000000000000000000000000000000000000..181886e93d7be8af29a27c2dd125f4d5458e1a10 GIT binary patch literal 5264 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 literal 0 HcmV?d00001 diff --git a/obj/main.o b/obj/main.o new file mode 100644 index 0000000000000000000000000000000000000000..689e6e0a73fb2a5f996220ca83e742a41e8daa00 GIT binary patch literal 1032 zcmb7D&ubG=5T3YAlO|Fv6n`CTJqRrrvAwhig+i-%2q@Y^y*PwsQx}p=+TH$;BBW<~ zXrPCJpgAV~1LoF+y?7Hnh?j!iLcx0?#Pplpx9ui9Iq)${BE)zuv zCc^;G5N8~K-2`U6tS2uFO%?g6Y62ZYT%f5uv#oF2N`RP`9xX4O>%eoABmFMHcQ8mF zY^*F481sr{uN&s73iS7LR9t$99R`jsz23_82>ptMQf9^G4Rgydv&`wmaQ=%DBz;kC^H~!u8^ZH8EcK;|@U*b=Q!kHZ1MhCY>8q zh~%Z>Q$SEqNZdNftq8&%Y-G?vAMAXwQE=c>`p0rJ@j=`}BEBp2j`PM5N-co*z;)h9Rk^ zBsbS#r;hcxcE>I(m1%9}zWR7?zJ;{9>R@lL3NXax{}-oWI+JUsbGm`g6q z|2yisR;`oQhU8$c2-f#a*)7n0QZ66~X({^jtnH#FGZA#Lwy*dCI$*}NyuEMd*(2!A2-P}<Kss%L> z&o59*H`Be9TY7J0+e6jgx~aN@+7kAnK41f4f;fMl^|qmQ%BUL^o4kIhLBF3BH6>z! z9EaNId7(r4LGUG?7W`EWYqnL?7-HQo{b8TkUkm5<^SP)S&*kc{k1wOgv*eYIej@&OJ)&t<}(^dva zOAYq909~m;kq@?m<-o&dC|y42Eu+_@UtR21Uev&_RZq)WZ|-r_I_G8+x!6KXwo!k= z2F`g?PUep~b*k#c;QB@kLi=LCF|~DCWSf|m2)bo`^?N?+05@tAZCzi?Jw-+C z$*(w0&rxv$F!&LVTU6XeY?srg zDqsFZ#T_5k!Bb0IFPpG)3vn*NhYjR>+vn7)!Z%SzTPGX)x%6A2$MfmYiiI`DxHcEE z>cJMLxA*rP>{R*6!%oo`h;<%4DDQ}AzQ4!i9eM$ET0blA__Kk6g}d)H^x{D058eUv zh`O^xfATj$^^@pN=e|=kqnU;?fs1-k_c4D%)-=_-=vTIjZDd`{FYOey2wTvjT{dj{ zRopiYPx%&Q%6wlU59}M~K8KoP-}w7e=I<50LEqKupYT2U0N*U8v0v;HzCl;+fX4gV z5z5q&C#Pm%3wSi}a1NSfbjXNaN6svq)sGyojkUQ(e}TR`IAIw4oY^zvzIxLfpqHSO z2Xe#X06ipM4WB!F2k6`U$iO)M2>L@QvF5NHkiRP*5A%1a;El!R|f7?7|}LIA;k2k;mK)%comoUPtz)4<)JtN42*uHqe%xQgG?5?AqN)hw^_ z3!4QFAjT;EnXcmdA#j#aBZEaVp52Gv-iLp%4<~aXHaRjAz80RnPUcKBGQNw9%_d@3 zCx@cfVu|5+bRs&LOpy6bG?B!v+PDZbEC>$w>)}{DE``WU&ct33O3ud;$*9mo=GaU$ v+KeZXGm(iYGA~Et(PR`bmY9l%Z(JAyqr(jw!_XR`cyeOu8S#G(Ziw+O1ol7S literal 0 HcmV?d00001 diff --git a/obj/structures.o b/obj/structures.o new file mode 100644 index 0000000000000000000000000000000000000000..9e36f24ec98fc0d004e69f4545a0d297ba70ef6c GIT binary patch literal 3456 zcmb7HO>7%Q6n@UywVgCg3zeF-l&%n!0yI_ngQx%tLsF>+0}%u%Qh{x-w_s{J#@@7z zB7{Xb1h_O3hf08IP!Dmr@)HXV5kaE2{s^HS9fXhr?V$&ti)76AcHSf#JCW!p<8Qus zzw>5xXLIGBTmNn(3J@Cq1kvYsV4|aKM?dUIJ=*p&5LQz+L`QR;=5C0EWjXd4M+m^O zMvjb*tZ+S=;{?#yUk5M}C3=7-f>dJA&9ah3r;yIQE)%W(w4bjh>Y(@NLp4eRITS-RGk3RD_{G*dUoMZZ)t;%+@m?qWFZ zes7en!`nyP>zJo4J61O6A0PxUFa+Rt4lrb7l@v$e}jGNP%(Jzb<|=h zT&jK$E?s}38?PY}MtvdGkvg|W-RZj5Dc}wogdH%+^L1$GxjR4M+QE6b0 zc~3txcHjAY;r=4bgV^uQ@#-H& z*<&9#6RT|a zJgoWrw$z%}>OBkcPMDQC@f_i~tigB9DB-!pI1EHhJ$;f*1-&SL{l9NeEh zQYhFHg~v_M>{uoWtE!VwC?<>W@126tO7Xa9+5r zx(j$h<|)oZU9)N=zefevv)6Zn$$FdH{pZELPodnRG6^^@!;-=_c`r7S+j|Pyw6^#c18Qf z^P8yacHmWDFYq#u{rmugYGPht4DTQQ7U+K&$a*6{)*A-GRU)AO!%+D-xSWV{QjFP zN5S=X-uvJ^(9!3JAviHKyLiu!aVOWZ_OS*FP!&@<@z~% zO1OTmt_au9$veXJdxQ6n?REP?xV%s3TjBaSdoA>Aj|xS%TlmGL^GW`)S6``Dn)4hp&CI@RQ8u@y~-d%1>I!H%^k3 z$NvG&2}H`~ok`D%EbR`l?2PT$B7OeEi2}xwjWFoS2tr76`AvNA>I lMcf^FS>9M>weL}q!67|3NEs)aKcFcFp!+q&0F*Zj?LX4a)gS-> literal 0 HcmV?d00001 diff --git a/srcs/structures.c b/srcs/structures.c index a969402..2577868 100644 --- a/srcs/structures.c +++ b/srcs/structures.c @@ -150,3 +150,8 @@ void displayListeDevis(ListeDevis l) l=l->suiv; } } + + +// Partie 4 (à trier) + +