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