diff --git a/f_bonus_print.c b/f_bonus_print.c index 2ac8545..e1e24c4 100644 --- a/f_bonus_print.c +++ b/f_bonus_print.c @@ -3,10 +3,10 @@ /* ::: :::::::: */ /* f_bonus_print.c :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: hulamy +#+ +:+ +#+ */ +/* By: hulamy +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/05/27 13:46:29 by hulamy #+# #+# */ -/* Updated: 2019/06/01 15:00:01 by hulamy ### ########.fr */ +/* Updated: 2019/06/01 16:18:58 by hulamy ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/f_handle_errors.c b/f_handle_errors.c index 93241fc..9e31ca8 100644 --- a/f_handle_errors.c +++ b/f_handle_errors.c @@ -6,7 +6,7 @@ /* By: vmanzoni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/03/01 13:29:05 by vmanzoni #+# #+# */ -/* Updated: 2019/06/01 14:49:01 by hulamy ### ########.fr */ +/* Updated: 2019/06/01 15:53:31 by vmanzoni ### ########.fr */ /* */ /* ************************************************************************** */ @@ -75,6 +75,8 @@ void check_file_errors(char *file, int *dope) print_error_extended(3, dope); i++; } + if (file[i - 1] == '\n') + print_error_extended(3, dope); if (line_nbr < 4) print_error_extended(4, dope); if (!dope[3] && line_nbr > 129) diff --git a/f_print.c b/f_print.c index d5ab0d2..01c14ee 100644 --- a/f_print.c +++ b/f_print.c @@ -1,7 +1,7 @@ /* ************************************************************************** */ /* */ /* ::: :::::::: */ -/* print.c :+: :+: :+: */ +/* f_print.c :+: :+: :+: */ /* +:+ +:+ +:+ */ /* By: hulamy +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ @@ -13,8 +13,8 @@ #include "fillit.h" /* -** function that print a map of height and width -** usefull to print tetris +** Function that print a map of height and width +** useful to print tetris */ void print_sized_map(unsigned int *tab, int width, int height, char letter) @@ -44,7 +44,7 @@ void print_sized_map(unsigned int *tab, int width, int height, char letter) /* ** Print the final map with the letters ** if flag value is 0 -> print moulinette version -** if flag value is 0 -> print in color +** if flag value is p -> print in color */ char *init_print_map(t_fillist *list, int size) @@ -53,7 +53,8 @@ char *init_print_map(t_fillist *list, int size) int i; int j; - map = (char *)malloc(sizeof(*map) * (size * size + 1)); + if (!(map = (char *)malloc(sizeof(*map) * (size * size + 1)))) + return (NULL); map[size * size] = '\0'; i = -1; while (++i < size * size) diff --git a/fillit.dSYM/Contents/Info.plist b/fillit.dSYM/Contents/Info.plist new file mode 100644 index 0000000..96bfe2d --- /dev/null +++ b/fillit.dSYM/Contents/Info.plist @@ -0,0 +1,20 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleIdentifier + com.apple.xcode.dsym.fillit + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + dSYM + CFBundleSignature + ???? + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1 + + diff --git a/main.c b/main.c index 3161953..c2903a1 100644 --- a/main.c +++ b/main.c @@ -6,7 +6,7 @@ /* By: vmanzoni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/02/12 13:20:48 by vmanzoni #+# #+# */ -/* Updated: 2019/06/01 14:40:58 by hulamy ### ########.fr */ +/* Updated: 2019/06/01 15:27:22 by vmanzoni ### ########.fr */ /* */ /* ************************************************************************** */ @@ -30,7 +30,7 @@ int *create_dope(char *av, int mdp) comp = "dope"; if (!(dope = (int*)malloc(sizeof(*dope) * 4))) - return (NULL); + return (0); i = 0; while (i < 4) dope[i++] = 0;