diff options
| -rw-r--r-- | include/libft_vec.h | 4 | ||||
| -rw-r--r-- | src/str/ft_strjoinf.c | 7 | ||||
| -rw-r--r-- | src/vec/ft_vecdestroy.c | 8 |
3 files changed, 9 insertions, 10 deletions
diff --git a/include/libft_vec.h b/include/libft_vec.h index f9d4eb3..c63c128 100644 --- a/include/libft_vec.h +++ b/include/libft_vec.h @@ -6,7 +6,7 @@ /* By: charles <charles.cabergs@gmail.com> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/04/01 18:57:16 by charles #+# #+# */ -/* Updated: 2020/07/15 18:28:30 by charles ### ########.fr */ +/* Updated: 2020/08/19 17:49:03 by charles ### ########.fr */ /* */ /* ************************************************************************** */ @@ -39,7 +39,7 @@ typedef struct s_ftvec } t_ftvec; t_ftvec *ft_vecnew(size_t capacity); -void ft_vecdestroy(t_ftvec *vec, void (*del)(void *elem)); +void *ft_vecdestroy(t_ftvec *vec, void (*del)(void *elem)); t_ftvec *ft_vecgrow(t_ftvec *vec); t_ftvec *ft_vecreserve(t_ftvec *vec, size_t capacity); t_ftvec *ft_vecpush(t_ftvec *vec, void *pushed); 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) diff --git a/src/vec/ft_vecdestroy.c b/src/vec/ft_vecdestroy.c index 781e02e..0021573 100644 --- a/src/vec/ft_vecdestroy.c +++ b/src/vec/ft_vecdestroy.c @@ -6,7 +6,7 @@ /* By: charles <charles.cabergs@gmail.com> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/04/01 19:06:22 by charles #+# #+# */ -/* Updated: 2020/04/01 19:09:09 by charles ### ########.fr */ +/* Updated: 2020/08/19 17:49:30 by charles ### ########.fr */ /* */ /* ************************************************************************** */ @@ -16,14 +16,16 @@ ** \brief Destroy a vector ** \param vec Vector to destroy ** \param del Delete function applied to each element of the vector +** \return NULL */ -void ft_vecdestroy(t_ftvec *vec, void (*del)(void *elem)) +void *ft_vecdestroy(t_ftvec *vec, void (*del)(void *elem)) { if (vec == NULL) - return ; + return (NULL); if (del != NULL) ft_veciter(vec, del); free(vec->data); free(vec); + return (NULL); } |