diff --git a/algorithms/insertion/insertion.c b/algorithms/insertion/insertion.c index f5fe9ca..2b403f4 100644 --- a/algorithms/insertion/insertion.c +++ b/algorithms/insertion/insertion.c @@ -24,7 +24,8 @@ static int to_insert(t_stacks *stacks, int sorted) a = stacks->a; while (i < sorted) { - if (stacks->b->value > a->previous->value && stacks->b->value <= a->value) + if (stacks->b->value > a->previous->value + && stacks->b->value <= a->value) return (i); a = a->previous; i++; diff --git a/algorithms/medium/sort_utils.c b/algorithms/medium/sort_utils.c index afea4b4..66424fa 100644 --- a/algorithms/medium/sort_utils.c +++ b/algorithms/medium/sort_utils.c @@ -92,4 +92,4 @@ void push_range_to_b(t_stacks *piles, t_tab *one_preset, int range) sort_little_pile(piles); one_preset->nb_in--; } -} \ No newline at end of file +} diff --git a/algorithms/medium/utils_medium.c b/algorithms/medium/utils_medium.c index 37e8c86..5b78da6 100644 --- a/algorithms/medium/utils_medium.c +++ b/algorithms/medium/utils_medium.c @@ -53,7 +53,6 @@ int calcul_range(int value, int range) { int max_range; - max_range = 0; if (value < 0) while (max_range > value) diff --git a/algorithms/medium/utils_medium_two.c b/algorithms/medium/utils_medium_two.c index 8ff6ad6..70d91ed 100644 --- a/algorithms/medium/utils_medium_two.c +++ b/algorithms/medium/utils_medium_two.c @@ -64,7 +64,7 @@ int range_bucket(t_stack *first) int sqrt; len = stack_len(first); - diff = (get_max_number(first) - get_min_number(first)) ; + diff = get_max_number(first) - get_min_number(first); sqrt = my_sqrt(len); if (diff / sqrt < 2) { diff --git a/flags/flag.c b/flags/flag.c index 55c20eb..31e0811 100644 --- a/flags/flag.c +++ b/flags/flag.c @@ -25,5 +25,4 @@ void flags(int pos, char **argv, t_stacks *piles) adaptive(piles); else adaptive(piles); - } diff --git a/headers/flags.h b/headers/flags.h index b7b82a7..90130e2 100644 --- a/headers/flags.h +++ b/headers/flags.h @@ -13,7 +13,7 @@ #ifndef FLAGS_H # define FLAGS_H -void simple(t_stacks *piles); +void simple(t_stacks *piles); void medium(t_stacks *piles); void complex(t_stacks *piles); void adaptive(t_stacks *piles); diff --git a/headers/parsing.h b/headers/parsing.h index d5f4358..5a59a8d 100644 --- a/headers/parsing.h +++ b/headers/parsing.h @@ -13,9 +13,9 @@ #ifndef PARSING_H # define PARSING_H -int ft_atoi(const char *nptr); +int ft_atoi(const char *nptr); t_stacks *init_big_stacks2(int *tab, int len); t_stacks *init_big_stacks(int argc, char **argv); -int ft_strncmp(const char *s1, const char *s2, int n); +int ft_strncmp(const char *s1, const char *s2, int n); #endif diff --git a/stack_utils/stack_remove.c b/stack_utils/stack_remove.c index d53c3a8..a8561d3 100644 --- a/stack_utils/stack_remove.c +++ b/stack_utils/stack_remove.c @@ -28,5 +28,5 @@ void free_all(t_stacks *piles) stack_clear_all(piles->a, piles->a); if (piles->b) stack_clear_all(piles->b, piles->b); - free(piles); + free(piles); } diff --git a/test_one.c b/test_one.c index c710be1..7ea1979 100644 --- a/test_one.c +++ b/test_one.c @@ -28,10 +28,7 @@ int test1(int argc, char **argv) preset = get_tabs(piles->a, range_bucket(piles->a)); bucket_algo(piles, preset, range_bucket(piles->a)); } - if (piles->a) - stack_clear_all(piles->a, piles->a); - if (piles->b) - stack_clear_all(piles->b, piles->b); + free_all(piles); free(piles); return (0); }