aboutsummaryrefslogtreecommitdiff
path: root/src/str
diff options
context:
space:
mode:
authorCharles Cabergs <me@cacharle.xyz>2020-08-19 17:57:05 +0200
committerCharles Cabergs <me@cacharle.xyz>2020-08-19 17:57:05 +0200
commitb878aa62024fdff08a9a76d80ddbeb1ee19d9179 (patch)
treec3b4d7b7ef080f68de48a4ed4020a9640156e5d3 /src/str
parent450e36f8ddf974e503731288c8d8bb8c62e67e47 (diff)
downloadlibft-b878aa62024fdff08a9a76d80ddbeb1ee19d9179.tar.gz
libft-b878aa62024fdff08a9a76d80ddbeb1ee19d9179.tar.bz2
libft-b878aa62024fdff08a9a76d80ddbeb1ee19d9179.zip
ft_vecdestroy return NULL to norm easily
Diffstat (limited to 'src/str')
-rw-r--r--src/str/ft_strjoinf.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/str/ft_strjoinf.c b/src/str/ft_strjoinf.c
index e5edced..5504ceb 100644
--- a/src/str/ft_strjoinf.c
+++ b/src/str/ft_strjoinf.c
@@ -6,12 +6,10 @@
/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2020/02/14 03:41:07 by cacharle #+# #+# */
-/* Updated: 2020/06/12 11:45:59 by charles ### ########.fr */
+/* Updated: 2020/08/19 13:31:00 by charles ### ########.fr */
/* */
/* ************************************************************************** */
-#include <stdlib.h>
-#include "libft.h"
#include "libft_str.h"
char *ft_strjoinf(char const *s1, char const *s2, t_ftstrjoinf_tag tag)
@@ -20,8 +18,7 @@ char *ft_strjoinf(char const *s1, char const *s2, t_ftstrjoinf_tag tag)
if (s1 == NULL || s2 == NULL)
return (NULL);
- if ((joined = ft_strjoin(s1, s2)) == NULL)
- return (NULL);
+ joined = ft_strjoin(s1, s2);
if (tag == FT_STRJOINF_FST)
free((void*)s1);
else if (tag == FT_STRJOINF_SND)