diff --git a/libft b/libft index d58ee38..af88c1c 160000 --- a/libft +++ b/libft @@ -1 +1 @@ -Subproject commit d58ee38bab0a9e0449d98efc9522b124c71632fd +Subproject commit af88c1ce23f0daa453c70cee0c61a30f71c2a622 diff --git a/srcs/parsing/expansions/expand_token.c b/srcs/parsing/expansions/expand_token.c index b0ee83d..4cc2fe8 100644 --- a/srcs/parsing/expansions/expand_token.c +++ b/srcs/parsing/expansions/expand_token.c @@ -99,10 +99,6 @@ static t_list *ret_parameter_expansion(char *content, int *i) free(tmp); if (expand->content) expand->content = ft_strdup(expand->content); - else - expand->content = ft_calloc(1, 1); - if (!expand->content) - return (ft_retp_free(NULL, expand, free)); return (expand); } diff --git a/srcs/parsing/expansions/rejoin_after_expand.c b/srcs/parsing/expansions/rejoin_after_expand.c index c56c98b..917b921 100644 --- a/srcs/parsing/expansions/rejoin_after_expand.c +++ b/srcs/parsing/expansions/rejoin_after_expand.c @@ -18,12 +18,7 @@ char *rejoin_after_expand(t_list *expand_lst) char *result; head = expand_lst; - result = ft_calloc(1, 1); - if (!result) - {//todo wrap - perror("rejoin_after_expand() error"); - return (ft_lstclear(&head, free)); - } + result = NULL; while (expand_lst) { result = ft_strjoinfree_s1(result, expand_lst->content);