42/42_INT_03_ft_printf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ajout compte des reussites sur main

Browse Source
This commit is contained in:
hugodu69
2020-06-30 14:02:34 +02:00
parent 69c095a307
commit 2065ac0431
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
main.c
View File

@@ -61,7 +61,7 @@ int ft_printf(char *string, ...);
fflush(stdout); \ fflush(stdout); \
/* compare the results saved in the two files before */\ /* compare the results saved in the two files before */\
/* also save if there was a difference in int 'onk' */\ /* also save if there was a difference in int 'onk' */\
onk = ft_compare(outf, outft, &error, (ftpout == pout)); \ onk = ft_compare(outf, outft, &error, &success, (ftpout == pout)); \
fflush(stdout); \ fflush(stdout); \
/* if no diff */\ /* if no diff */\
if (onk == 1) \ if (onk == 1) \
@@ -88,7 +88,7 @@ int ft_printf(char *string, ...);
close(outf); \ close(outf); \
close(outft); close(outft);
int ft_compare(int fd1, int fd2, int *error, int output); int ft_compare(int fd1, int fd2, int *error, int *success, int output);
/* /*
** this is the main function of tests, with a loooooot of tests, enjoy ;) ** this is the main function of tests, with a loooooot of tests, enjoy ;)
@@ -114,6 +114,8 @@ int main(int ac, char **av)
open("outft.txt", O_CREAT, 0644); open("outft.txt", O_CREAT, 0644);
// error is used to count the total nbr of error // error is used to count the total nbr of error
static int error = 0; static int error = 0;
// success is used to count the total nbr of success
static int success = 0;
// to catch an error for one call of ft_printf // to catch an error for one call of ft_printf
int onk = 1; int onk = 1;
// those two ints saves the return value of printf and ft_printf // those two ints saves the return value of printf and ft_printf
@@ -1325,6 +1327,7 @@ int main(int ac, char **av)
printf("----------------------------------------------------------------\n\n"); printf("----------------------------------------------------------------\n\n");
close(save); close(save);
printf("\033[92m%i TESTS SUCCESSFUL\033[0m\n", success);
if (error != 0) if (error != 0)
printf("\033[91m%i ERRORS\033[0m\n", error); printf("\033[91m%i ERRORS\033[0m\n", error);
return (0); return (0);
@@ -1337,7 +1340,7 @@ int main(int ac, char **av)
** and it read them and compare them ** and it read them and compare them
*/ */
int ft_compare(int fd1, int fd2, int *error, int output) int ft_compare(int fd1, int fd2, int *error, int *success, int output)
{ {
int ret1 = 1; int ret1 = 1;
int ret2 = 1; int ret2 = 1;
@@ -1373,6 +1376,7 @@ int ft_compare(int fd1, int fd2, int *error, int output)
return (0); return (0);
} }
ft_putstr("\033[92mJACKPOT\033[0m"); ft_putstr("\033[92mJACKPOT\033[0m");
(*success)++;
return (1); return (1);
} }