diff --git a/SAE2 b/SAE2 index d9a93a0..e570727 100755 Binary files a/SAE2 and b/SAE2 differ diff --git a/files/precedences.txt b/files/precedences.txt index f3c3b0e..77ca830 100644 --- a/files/precedences.txt +++ b/files/precedences.txt @@ -3,7 +3,7 @@ Structure Electricite Structure Plomberie Plomberie Murs Electricite Menuiserie -Plomberie Sols +Plomberies Sols Murs Peinture Peinture Finitions -Sols Finitions \ No newline at end of file +Sols Finitions diff --git a/obj/charge.o b/obj/charge.o index 15db47f..98ba86b 100644 Binary files a/obj/charge.o and b/obj/charge.o differ diff --git a/srcs/charge.c b/srcs/charge.c index fb09642..2f259b5 100644 --- a/srcs/charge.c +++ b/srcs/charge.c @@ -119,7 +119,7 @@ Precedence *loadPrec(int *tmax, int *tlog) FILE *prec; Precedence *tabP, *s; char *precSuccStr; - int index=0; + int index; prec=fopen("files/precedences.txt", "r"); (*tmax)=0; (*tlog)=0; @@ -138,6 +138,7 @@ Precedence *loadPrec(int *tmax, int *tlog) precSuccStr = readFromFile(prec); while(!feof(prec)) { + index=0; printf("%s\n", precSuccStr); if((*tlog)==(*tmax)) { @@ -150,19 +151,20 @@ Precedence *loadPrec(int *tmax, int *tlog) } tabP = s; } - printf("HI\n"); while (precSuccStr[index] != '\t') index++; - printf("HELLO\n"); strcpy(tabP[*tlog].travauxSucc, precSuccStr+index+1); precSuccStr[index]='\0'; strcpy(tabP[*tlog].travauxPrec, precSuccStr); + printf("HI\n"); precSuccStr = readFromFile(prec); (*tlog)++; + printf("HELLO\n"); } + printf("HI\n"); free(precSuccStr); fclose(prec); return tabP;