diff --git a/f_bonus_print.c b/f_bonus_print.c index a221cec..2ac8545 100644 --- a/f_bonus_print.c +++ b/f_bonus_print.c @@ -6,7 +6,7 @@ /* By: hulamy +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/05/27 13:46:29 by hulamy #+# #+# */ -/* Updated: 2019/06/01 14:17:43 by hulamy ### ########.fr */ +/* Updated: 2019/06/01 15:00:01 by hulamy ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/f_read_file.c b/f_read_file.c index 0157491..eaa43bf 100644 --- a/f_read_file.c +++ b/f_read_file.c @@ -6,7 +6,7 @@ /* By: vmanzoni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/04/13 12:09:46 by vmanzoni #+# #+# */ -/* Updated: 2019/05/29 16:10:58 by hulamy ### ########.fr */ +/* Updated: 2019/06/01 15:12:03 by hulamy ### ########.fr */ /* */ /* ************************************************************************** */ @@ -36,3 +36,15 @@ char *read_file(char *file) close(fd); return (result); } + +/* +** Function that init num and size for search_map +*/ + +void init_num_and_size(int num, int *size, t_fillist *tmp) +{ + while ((tmp = tmp->next)) + num++; + while (*size * *size < num * 4) + (*size)++; +} diff --git a/f_search_map.c b/f_search_map.c index 13e5b94..2904444 100644 --- a/f_search_map.c +++ b/f_search_map.c @@ -6,7 +6,7 @@ /* By: hulamy +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/04/27 20:47:22 by hulamy #+# #+# */ -/* Updated: 2019/06/01 14:19:22 by hulamy ### ########.fr */ +/* Updated: 2019/06/01 15:12:08 by hulamy ### ########.fr */ /* */ /* ************************************************************************** */ @@ -148,12 +148,8 @@ int search_map(t_fillist *list) int i; size = 2; - num = 1; tmp = print_tetri(list); - while ((tmp = tmp->next)) - num++; - while (size * size < num * 4) - size++; + init_num_and_size(1, &size, tmp); i = 0; while (!i) { @@ -164,6 +160,8 @@ int search_map(t_fillist *list) while (num--) map[num] = 0; i = fill_map(map, list, size++); + if (!i) + free(map); } return (print_binary_map(map, size, list->dope)); } 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/fillit.h b/fillit.h index 56c9dbc..1f61ed3 100644 --- a/fillit.h +++ b/fillit.h @@ -6,7 +6,7 @@ /* By: vmanzoni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/03/01 13:34:46 by vmanzoni #+# #+# */ -/* Updated: 2019/06/01 14:34:31 by hulamy ### ########.fr */ +/* Updated: 2019/06/01 15:12:00 by hulamy ### ########.fr */ /* */ /* ************************************************************************** */ @@ -97,6 +97,7 @@ int main(int argc, char **argv); ** read_file.c */ char *read_file(char *file); +void init_num_and_size(int num, int *size, t_fillist *tmp); /* ** handle_errors.c