diff --git a/includes/fillit.h b/includes/fillit.h index 90fafa5..5be5d50 100644 --- a/includes/fillit.h +++ b/includes/fillit.h @@ -6,7 +6,7 @@ /* By: vmanzoni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/03/01 13:34:46 by vmanzoni #+# #+# */ -/* Updated: 2019/04/14 12:34:30 by vmanzoni ### ########.fr */ +/* Updated: 2019/04/14 14:31:26 by vmanzoni ### ########.fr */ /* */ /* ************************************************************************** */ @@ -33,7 +33,7 @@ void print_test(char *test); */ char *read_file(char *file); -void ft_display_error(char *s, int fd); +void print_error(char *s, int fd); int ft_file_errors(char *file); #endif diff --git a/srcs/handle_errors.c b/srcs/handle_errors.c index 58e8995..b0b4dc8 100644 --- a/srcs/handle_errors.c +++ b/srcs/handle_errors.c @@ -6,7 +6,7 @@ /* By: vmanzoni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/03/01 13:29:05 by vmanzoni #+# #+# */ -/* Updated: 2019/04/14 14:25:44 by vmanzoni ### ########.fr */ +/* Updated: 2019/04/14 14:39:12 by vmanzoni ### ########.fr */ /* */ /* ************************************************************************** */ @@ -16,9 +16,9 @@ ** Function that display error message *s on fd */ -void ft_display_error(char *s, int fd) +void print_error(char *s) { - write(fd, s, strlen(s)); + write(2, s, strlen(s)); } /* diff --git a/srcs/main.c b/srcs/main.c index cc544e5..77a239f 100644 --- a/srcs/main.c +++ b/srcs/main.c @@ -6,7 +6,7 @@ /* By: vmanzoni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/02/12 13:20:48 by vmanzoni #+# #+# */ -/* Updated: 2019/04/14 14:27:31 by vmanzoni ### ########.fr */ +/* Updated: 2019/04/14 14:39:28 by vmanzoni ### ########.fr */ /* */ /* ************************************************************************** */ @@ -19,9 +19,9 @@ int main(int argc, char **argv) if (argc == 2) { if (!(input = read_file(argv[1]))) - ft_display_error("Error: Could not read file.\n", 2); - if (ft_file_errors(input)) - ft_display_error("Error: Invalid file.\n", 2); + print_error("Error: Could not read file.\n"); + else if (ft_file_errors(input)) + print_error("Error: Invalid file.\n"); /* Check if every tetrimino is valid Transform input to tetriminos @@ -32,6 +32,6 @@ int main(int argc, char **argv) print_test(input); } else - ft_display_error("Error: Please submit a file.\n", 2); + print_error("Error: Please submit a file.\n"); return (0); } diff --git a/srcs/print_fillit.c b/srcs/print_fillit.c index 551a7dc..75ef681 100644 --- a/srcs/print_fillit.c +++ b/srcs/print_fillit.c @@ -6,7 +6,7 @@ /* By: vmanzoni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/03/01 13:35:48 by vmanzoni #+# #+# */ -/* Updated: 2019/04/14 14:27:47 by vmanzoni ### ########.fr */ +/* Updated: 2019/04/14 14:32:02 by vmanzoni ### ########.fr */ /* */ /* ************************************************************************** */ @@ -22,5 +22,4 @@ void ft_print_fillit() void print_test(char *test) { write(1, test, strlen(test)); - write(1, "\n", 1); }