diff --git a/includes/charge.h b/includes/charge.h index 7e046fe..0c604d1 100644 --- a/includes/charge.h +++ b/includes/charge.h @@ -1,5 +1,4 @@ #include "structures.h" -#include void trace(char str[]); diff --git a/includes/main.h b/includes/main.h index 4dfc2a0..aa7cd85 100644 --- a/includes/main.h +++ b/includes/main.h @@ -1,8 +1,3 @@ -#include -#include -#include -#include - #include "charge.h" #define TMAXTRAV 8 diff --git a/includes/structures.h b/includes/structures.h index d4ba177..d5fcb5d 100644 --- a/includes/structures.h +++ b/includes/structures.h @@ -1,3 +1,7 @@ +#include +#include +#include + typedef struct { char *nomE; diff --git a/srcs/charge.c b/srcs/charge.c index 8ff0367..c795739 100644 --- a/srcs/charge.c +++ b/srcs/charge.c @@ -8,8 +8,8 @@ Offre **initTabTravaux(void) trace("initTabTravaux"); Offre **tabTravaux; - tabTravaux = (Offre **)malloc(TMAXTRAV* sizeof(Offre *)); - if (!tabTravaux) + tabTravaux = (Offre **)malloc(TMAXTRAV * sizeof(Offre *)); + if (tabTravaux == NULL) { printf("\033[0;31mErreur: \033[0mmalloc tableau tabTravaux\n"); exit(1); @@ -41,7 +41,7 @@ char *readFromFile(FILE *file) int add = 5; str = (char *)malloc(size * sizeof(char)); - if (!str) + if (str == NULL) exit(1); while (str[len] != '\n') @@ -51,7 +51,7 @@ char *readFromFile(FILE *file) { size += add; buf = realloc(str, size); - if (!buf) + if (buf == NULL) { free(str); exit(1); @@ -92,8 +92,11 @@ Offre **loadOffre(void) FILE *devisFile; devisFile = fopen("files/devis.txt", "r"); - if (!devisFile) //ERREUR + if (devisFile == NULL) //ERREUR + { + printf("\033[0;31mErreur: \033[0mouverture devis.txt"); exit(1); + } while (!feof(devisFile)) loadDevis(devisFile, tabTravaux); diff --git a/srcs/sort.c b/srcs/sort.c index 006ccea..8808bea 100644 --- a/srcs/sort.c +++ b/srcs/sort.c @@ -37,7 +37,7 @@ void minTravaux(Offre *tabTravaux[]) md = NULL; s = NULL; minDev = tabTravaux[i]->ldevis; - if (!md && minDev->suiv) + if (md == NULL && minDev->suiv) md = minDev->suiv; while (md) { @@ -48,9 +48,9 @@ void minTravaux(Offre *tabTravaux[]) minDev = md; md = md->suiv; } - else if ((md->dev).prix == (minDev->dev).prix && ((md->dev).capital == (minDev->dev).capital)) + else if ((md->dev).prix == (minDev->dev).prix && ((md->dev).capital == (minDev->dev).capital)) // PAS UNE ERREUR { - printf("deux offres minimales !!!\n"); + printf("deux offres minimales !\n"); exit (1); } else