diff options
| -rw-r--r-- | ft_strjoin_free.c | 9 | ||||
| -rw-r--r-- | ft_strjoin_free_snd.c | 7 |
2 files changed, 5 insertions, 11 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) diff --git a/ft_strjoin_free_snd.c b/ft_strjoin_free_snd.c index 46e36ae..0503211 100644 --- a/ft_strjoin_free_snd.c +++ b/ft_strjoin_free_snd.c @@ -6,7 +6,7 @@ /* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/11/05 22:12:56 by cacharle #+# #+# */ -/* Updated: 2019/11/05 22:17:15 by cacharle ### ########.fr */ +/* Updated: 2019/11/14 10:07:19 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -19,11 +19,8 @@ char *ft_strjoin_free_snd(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_strjoin(s1, s2)) == NULL) return (NULL); - joined = ft_strcpy(joined, s1); - joined = ft_strcat(joined, s2); free((void*)s2); return (joined); } |