diff options
Diffstat (limited to 'c12/ex14')
| -rw-r--r-- | c12/ex14/ft_list.h | 4 | ||||
| -rw-r--r-- | c12/ex14/ft_list_sort.c | 19 |
2 files changed, 14 insertions, 9 deletions
diff --git a/c12/ex14/ft_list.h b/c12/ex14/ft_list.h index cf65023..059a1aa 100644 --- a/c12/ex14/ft_list.h +++ b/c12/ex14/ft_list.h @@ -6,12 +6,12 @@ /* By: cacharle <charles.cabergs@gmail.com> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/07/09 14:33:17 by cacharle #+# #+# */ -/* Updated: 2019/07/19 08:26:25 by cacharle ### ########.fr */ +/* Updated: 2019/07/23 15:22:22 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef FT_LIST_H -#define FT_LIST_H +# define FT_LIST_H typedef struct s_list { diff --git a/c12/ex14/ft_list_sort.c b/c12/ex14/ft_list_sort.c index 698d345..0d81425 100644 --- a/c12/ex14/ft_list_sort.c +++ b/c12/ex14/ft_list_sort.c @@ -6,14 +6,19 @@ /* By: cacharle <charles.cabergs@gmail.com> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/07/19 13:43:11 by cacharle #+# #+# */ -/* Updated: 2019/07/19 13:53:54 by cacharle ### ########.fr */ +/* Updated: 2019/07/23 15:41:20 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ -static int is_sorted(t_list **begin_list, int (*cmp)()) -{ - t_list *cursor; +#include <stdlib.h> +#include "ft_list.h" +static int is_sorted(t_list *cursor, int (*cmp)()) +{ + if (cursor == NULL) + return (1); + else if (cursor->next == NULL) + return (1); while (cursor->next) { if ((*cmp)(cursor->data, cursor->next->data) > 0) @@ -23,7 +28,7 @@ static int is_sorted(t_list **begin_list, int (*cmp)()) return (1); } -void ft_list_sort(t_list **begin_list, int (*cmp)()) +void ft_list_sort(t_list **begin_list, int (*cmp)()) { t_list *cursor; void *tmp; @@ -36,8 +41,8 @@ void ft_list_sort(t_list **begin_list, int (*cmp)()) if ((*cmp)(cursor->data, cursor->next->data) > 0) { tmp = cursor->data; - cursor->data = cursor->data->next; - cursor->data->next = tmp; + cursor->data = cursor->next->data; + cursor->next->data = tmp; } cursor = cursor->next; } |