|
|
|
@ -82,7 +82,7 @@ Listchoixdept inserercarte(Listchoixdept c, FILE *fe){
|
|
|
|
|
Maillonchoix* cc;
|
|
|
|
|
cc = (Maillonchoix*)malloc(sizeof(Maillonchoix));
|
|
|
|
|
if(cc==NULL){printf("<! pb malloc in ajoutercarte !>\n");exit(1);}
|
|
|
|
|
fscanf(fe, "%s %s %d %d", cc.Ville, cc.dep, &cc.decision, &cc.validation);
|
|
|
|
|
fscanf(fe, "%s %s %d %d", cc->Ville, cc->dep, &cc->decision, &cc->validation);
|
|
|
|
|
cc->suivant=c;
|
|
|
|
|
return cc;
|
|
|
|
|
}
|
|
|
|
@ -94,7 +94,7 @@ Listchoixdept lireChoix(FILE *fe, int nbchoix){
|
|
|
|
|
Listchoixdept c, temp;
|
|
|
|
|
c = listchoixdeptvide();
|
|
|
|
|
for(i=0; i<nbchoix; i++){
|
|
|
|
|
c = inserercarte(c, *fe);
|
|
|
|
|
c = inserercarte(c, fe);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -143,7 +143,7 @@ void test1(void){
|
|
|
|
|
for(j=0; j<nb; j++){
|
|
|
|
|
for(i=0; i<tetu[j]->nbchoix; i++){
|
|
|
|
|
printf("carte %d={", i+1);
|
|
|
|
|
affichageensemble(tetu[j]->lchoixdept);
|
|
|
|
|
affichage(tetu[j]->lchoixdept);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|