diff options
| author | Charles <sircharlesaze@gmail.com> | 2019-07-24 08:02:55 +0200 |
|---|---|---|
| committer | Charles <sircharlesaze@gmail.com> | 2019-07-24 08:02:55 +0200 |
| commit | 5bab06313e71e9827baa426a02bbaf2a00b4e6a0 (patch) | |
| tree | 5604e51c0008088f25b2f5dfb9143a852dd079dd /c12/ex13 | |
| parent | 23ad79e8b41c25bb4992d103d29a17612a52e351 (diff) | |
| download | piscine-5bab06313e71e9827baa426a02bbaf2a00b4e6a0.tar.gz piscine-5bab06313e71e9827baa426a02bbaf2a00b4e6a0.tar.bz2 piscine-5bab06313e71e9827baa426a02bbaf2a00b4e6a0.zip | |
c12 passed, c13 start
Diffstat (limited to 'c12/ex13')
| -rw-r--r-- | c12/ex13/ft_list.h | 4 | ||||
| -rw-r--r-- | c12/ex13/ft_list_merge.c | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/c12/ex13/ft_list.h b/c12/ex13/ft_list.h index f0a6674..aa23ccf 100644 --- a/c12/ex13/ft_list.h +++ b/c12/ex13/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:38 by cacharle ### ########.fr */ +/* Updated: 2019/07/23 15:22:12 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef FT_LIST_H -#define FT_LIST_H +# define FT_LIST_H typedef struct s_list { diff --git a/c12/ex13/ft_list_merge.c b/c12/ex13/ft_list_merge.c index 4de2ff3..34c9614 100644 --- a/c12/ex13/ft_list_merge.c +++ b/c12/ex13/ft_list_merge.c @@ -6,15 +6,20 @@ /* By: cacharle <charles.cabergs@gmail.com> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/07/19 08:50:01 by cacharle #+# #+# */ -/* Updated: 2019/07/19 08:51:36 by cacharle ### ########.fr */ +/* Updated: 2019/07/23 15:40:47 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ -void ft_list_merge(t_list **begin_list1, t_list *begin_list2) +#include <stdlib.h> +#include "ft_list.h" + +void ft_list_merge(t_list **begin_list1, t_list *begin_list2) { t_list *cursor; cursor = *begin_list1; + if (cursor == NULL) + *begin_list1 = begin_list2; while (cursor->next) cursor = cursor->next; cursor->next = begin_list2; |