diff options
Diffstat (limited to 'ft_strjoin.c')
| -rw-r--r-- | ft_strjoin.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/ft_strjoin.c b/ft_strjoin.c index 0078d65..2bc4908 100644 --- a/ft_strjoin.c +++ b/ft_strjoin.c @@ -6,11 +6,10 @@ /* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/10/07 10:35:26 by cacharle #+# #+# */ -/* Updated: 2019/10/07 10:38:07 by cacharle ### ########.fr */ +/* Updated: 2019/11/20 04:02:20 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ -#include <stdlib.h> #include "libft.h" char *ft_strjoin(char const *s1, char const *s2) @@ -19,9 +18,7 @@ char *ft_strjoin(char const *s1, char const *s2) if (s1 == NULL || s2 == NULL) return (NULL); - if ((joined = (char*)malloc(sizeof(char) - * (ft_strlen(s1) + ft_strlen(s2) + 1))) == NULL) + if ((joined = ft_strnew(ft_strlen(s1) + ft_strlen(s2))) == NULL) return (NULL); - joined = ft_strcpy(joined, s1); - return (ft_strcat(joined, s2)); + return (ft_strcat(ft_strcpy(joined, s1), s2)); } |