diff options
| author | Charles <sircharlesaze@gmail.com> | 2019-11-20 04:14:05 +0100 |
|---|---|---|
| committer | Charles <sircharlesaze@gmail.com> | 2019-11-20 04:25:15 +0100 |
| commit | 6a0f42bafdf8b17d24871a1da836dd12a107cf24 (patch) | |
| tree | c61831c4a7d61a1a9ce468073015fc5b0f63e4ec /ft_strjoin_free.c | |
| parent | fbdb3cab8614d2c81622604eb1eeb9f42a56c14f (diff) | |
| parent | d0c146c2274198814e106b17ea1f9461a1b0b81a (diff) | |
| download | libft-6a0f42bafdf8b17d24871a1da836dd12a107cf24.tar.gz libft-6a0f42bafdf8b17d24871a1da836dd12a107cf24.tar.bz2 libft-6a0f42bafdf8b17d24871a1da836dd12a107cf24.zip | |
Merge branch 'rendu'
Diffstat (limited to 'ft_strjoin_free.c')
| -rw-r--r-- | ft_strjoin_free.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/ft_strjoin_free.c b/ft_strjoin_free.c index 18ce83d..4050b77 100644 --- a/ft_strjoin_free.c +++ b/ft_strjoin_free.c @@ -6,7 +6,7 @@ /* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/11/05 21:32:48 by cacharle #+# #+# */ -/* Updated: 2019/11/05 22:17:03 by cacharle ### ########.fr */ +/* Updated: 2019/11/14 10:07:10 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -17,13 +17,10 @@ char *ft_strjoin_free(char const *s1, char const *s2, int free_nb) { char *joined; - if (s1 == NULL || s2 == NULL) + if (s1 == NULL || s2 == NULL || free_nb < 0 || free_nb > 2) return (NULL); - if ((joined = (char*)malloc(sizeof(char) - * (ft_strlen(s1) + ft_strlen(s2) + 1))) == NULL) + if ((joined = ft_strjoin(s1, s2)) == NULL) return (NULL); - joined = ft_strcpy(joined, s1); - joined = ft_strcat(joined, s2); if (free_nb == 1) free((void*)s1); if (free_nb == 2) |