From 2eed0f2d453d4ffa765035ed49135a1a51c1d216 Mon Sep 17 00:00:00 2001 From: LuckyLaszlo Date: Fri, 3 Dec 2021 16:10:04 +0100 Subject: [PATCH] little fix, ft_lstnew_generic() prototype. + unused c var in builtin_env() --- srcs/builtins/env.c | 3 ++- srcs/parsing/expansions/expand_token.c | 4 +--- srcs/parsing/expansions/new_token_for_each_field.c | 6 ++---- srcs/parsing/expansions/words_expansions.c | 3 +-- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/srcs/builtins/env.c b/srcs/builtins/env.c index 6642079..d634397 100644 --- a/srcs/builtins/env.c +++ b/srcs/builtins/env.c @@ -6,7 +6,7 @@ /* By: lperrey +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2021/10/10 05:01:26 by lperrey #+# #+# */ -/* Updated: 2021/11/27 11:18:55 by lperrey ### ########.fr */ +/* Updated: 2021/12/01 17:19:48 by lperrey ### ########.fr */ /* */ /* ************************************************************************** */ @@ -16,6 +16,7 @@ int builtin_env(int argc, char *argv[], t_all *c) // WIP { (void)argc; (void)argv; + (void)c; ft_putendl_arr_fd(environ, 1); return (0); } diff --git a/srcs/parsing/expansions/expand_token.c b/srcs/parsing/expansions/expand_token.c index 90ab62f..f9c3f81 100644 --- a/srcs/parsing/expansions/expand_token.c +++ b/srcs/parsing/expansions/expand_token.c @@ -6,14 +6,12 @@ /* By: lperrey +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2021/11/07 02:01:33 by lperrey #+# #+# */ -/* Updated: 2021/11/26 21:54:42 by lperrey ### ########.fr */ +/* Updated: 2021/11/30 18:35:44 by lperrey ### ########.fr */ /* */ /* ************************************************************************** */ #include "minishell.h" -t_list *ft_lstnew_generic(size_t lst_sizse, size_t content_size); - static t_list *ret_parameter_expansion(char *content, int *i); t_list *expand_token(char *content) diff --git a/srcs/parsing/expansions/new_token_for_each_field.c b/srcs/parsing/expansions/new_token_for_each_field.c index fa0eca5..f28e7c6 100644 --- a/srcs/parsing/expansions/new_token_for_each_field.c +++ b/srcs/parsing/expansions/new_token_for_each_field.c @@ -6,14 +6,12 @@ /* By: lperrey +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2021/11/07 02:01:33 by lperrey #+# #+# */ -/* Updated: 2021/11/30 13:46:46 by lperrey ### ########.fr */ +/* Updated: 2021/11/30 18:51:13 by lperrey ### ########.fr */ /* */ /* ************************************************************************** */ #include "minishell.h" -t_list *ft_lstnew_generic(size_t lst_sizse, size_t content_size); - static t_token *insert_tokens(t_token *t, t_token *insert_lst); int new_token_for_each_field(char **fields, t_token **t) @@ -29,7 +27,7 @@ int new_token_for_each_field(char **fields, t_token **t) { if (fields[i][0]) { - insert_lst->next = (t_token *)ft_lstnew_generic(sizeof(t_token), 0); + insert_lst->next = ft_lstnew_generic(sizeof(t_token), 0); insert_lst = insert_lst->next; if (!insert_lst) {//todo wrap diff --git a/srcs/parsing/expansions/words_expansions.c b/srcs/parsing/expansions/words_expansions.c index dfc9eb9..17f0a46 100644 --- a/srcs/parsing/expansions/words_expansions.c +++ b/srcs/parsing/expansions/words_expansions.c @@ -6,13 +6,12 @@ /* By: lperrey +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2021/11/07 02:01:33 by lperrey #+# #+# */ -/* Updated: 2021/11/26 21:05:01 by lperrey ### ########.fr */ +/* Updated: 2021/11/30 18:35:59 by lperrey ### ########.fr */ /* */ /* ************************************************************************** */ #include "minishell.h" -t_list *ft_lstnew_generic(size_t lst_sizse, size_t content_size); t_list *expand_token(char *content); char *rejoin_after_expand(t_list *expand_lst); int new_token_for_each_field(char **fields, t_token **t);