Skip to content

Commit bb0d591

Browse files
autiinpu2autiinpu2
committed
change free_double to free_var, and renamed function to search_mark
1 parent c795168 commit bb0d591

8 files changed

Lines changed: 33 additions & 24 deletions

File tree

‎includes/free.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/* By: apuyane <apuyane@student.42angouleme.fr +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2026/02/03 02:59:58 by apuyane #+# #+# */
9-
/* Updated: 2026/02/05 11:05:32 by apuyane ### ########.fr */
9+
/* Updated: 2026/03/24 06:48:43 by apuyane ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

@@ -15,12 +15,13 @@
1515

1616
# include "minishell.h"
1717
# include "env.h"
18+
# include <stdarg.h>
1819

1920
void free_data(t_data *data);
2021
void free_env(t_env *env);
2122
void free_tab(char **tab);
2223
void free_single(void *s);
23-
void free_double(void *s1, void *s2);
24+
void free_var(int n, ...);
2425
void free_cmds(t_data *data);
2526

2627
#endif

‎src/exec/ft_unset.c‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/* By: apuyane <apuyane@student.42angouleme.fr +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2026/02/04 07:33:49 by apuyane #+# #+# */
9-
/* Updated: 2026/02/10 02:16:03 by apuyane ### ########.fr */
9+
/* Updated: 2026/03/24 06:49:03 by apuyane ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

@@ -29,8 +29,7 @@ static void remove_env_node(t_env *env, char *key)
2929
prev->next = curr->next;
3030
else
3131
env->top = curr->next;
32-
free_double(curr->key, curr->value);
33-
free_double(curr->text, curr);
32+
free_var(4, curr->key, curr->value, curr->text, curr);
3433
env->size -= 1;
3534
return ;
3635
}

‎src/exec/mark.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/* By: apuyane <apuyane@student.42angouleme.fr +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2026/02/15 14:31:00 by apuyane #+# #+# */
9-
/* Updated: 2026/03/21 03:50:00 by apuyane ### ########.fr */
9+
/* Updated: 2026/03/24 06:50:57 by apuyane ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

@@ -66,7 +66,7 @@ int add_mark(t_data *data, t_cmd cmd)
6666
return (0);
6767
}
6868

69-
int function(char *content, t_data *data, t_cmd cmd)
69+
int search_mark(char *content, t_data *data, t_cmd cmd)
7070
{
7171
int i;
7272
char **lines;
@@ -105,7 +105,7 @@ int go_to_mark(t_data *data, t_cmd cmd)
105105
ft_dprintf(2, "mark: no marks saved yet\n");
106106
return (1);
107107
}
108-
err = function(content, data, cmd);
108+
err = search_mark(content, data, cmd);
109109
if (err == 1)
110110
ft_dprintf(2, "mark: %s: mark not found\n", cmd.args[1]);
111111
return (err);

‎src/parse/expand_utils.c‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/* By: apuyane <apuyane@student.42angouleme.fr +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2026/02/13 06:33:48 by apuyane #+# #+# */
9-
/* Updated: 2026/03/21 06:29:59 by apuyane ### ########.fr */
9+
/* Updated: 2026/03/24 06:49:50 by apuyane ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

@@ -68,8 +68,7 @@ char *get_expanded_home(char *string, int begin, int end, t_data *data)
6868
total = ft_strjoin(str_begin, var);
6969
str_end = ft_substr(string, end, ft_strlen(string));
7070
total = ft_strjoin_free(total, str_end);
71-
free_single(str_begin);
72-
free_double(str_end, string);
71+
free_var(3, str_begin, str_end, string);
7372
return (total);
7473
}
7574

@@ -93,8 +92,7 @@ char *get_expanded_string(char *string, int begin, int end, t_data *data)
9392
total = ft_strjoin(str_begin, get_env_from_name(var, data->env));
9493
str_end = ft_substr(string, end, ft_strlen(string));
9594
total = ft_strjoin_free(total, str_end);
96-
free_double(str_begin, var);
97-
free_double(str_end, string);
95+
free_var(4, str_begin, var, str_end, string);
9896
return (total);
9997
}
10098

‎src/utils/envp_utils.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/* By: apuyane <apuyane@student.42angouleme.fr +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2026/01/25 06:09:40 by apuyane #+# #+# */
9-
/* Updated: 2026/03/21 04:06:26 by apuyane ### ########.fr */
9+
/* Updated: 2026/03/24 06:50:01 by apuyane ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

@@ -26,7 +26,7 @@ void change_env_value(t_data *data, char *key, char *new_value)
2626
{
2727
if (!ft_strcmp(node->key, key))
2828
{
29-
free_double(node->value, node->text);
29+
free_var(2, node->value, node->text);
3030
node->value = ft_strdup(new_value);
3131
node->text = ft_strdup(node->key);
3232
node->text = ft_strjoin_free(node->text, "=");

‎src/utils/free_protected.c‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/* By: apuyane <apuyane@student.42angouleme.fr +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2026/02/06 17:02:40 by apuyane #+# #+# */
9-
/* Updated: 2026/03/20 06:38:41 by apuyane ### ########.fr */
9+
/* Updated: 2026/03/24 06:52:38 by apuyane ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

@@ -19,8 +19,20 @@ void free_single(void *s)
1919
s = NULL;
2020
}
2121

22-
void free_double(void *s1, void *s2)
22+
void free_var(int n, ...)
2323
{
24-
free_single(s1);
25-
free_single(s2);
24+
int i;
25+
va_list args;
26+
void *ptr;
27+
28+
i = 0;
29+
va_start(args, n);
30+
while (i < n)
31+
{
32+
ptr = va_arg(args, void *);
33+
if (ptr)
34+
free_single(ptr);
35+
i++;
36+
}
37+
va_end(args);
2638
}

‎src/utils/free_utils.c‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/* By: apuyane <apuyane@student.42angouleme.fr +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2026/01/26 08:16:06 by apuyane #+# #+# */
9-
/* Updated: 2026/03/21 03:40:16 by apuyane ### ########.fr */
9+
/* Updated: 2026/03/24 06:50:20 by apuyane ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

@@ -24,8 +24,7 @@ void free_env(t_env *env)
2424
node = env->top;
2525
while (node)
2626
{
27-
free_double(node->key, node->value);
28-
free_single(node->text);
27+
free_var(3, node->key, node->value, node->text);
2928
tmp = node->next;
3029
free_single(node);
3130
node = tmp;

‎src/utils/history.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/* By: apuyane <apuyane@student.42angouleme.fr +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2026/02/13 03:32:53 by apuyane #+# #+# */
9-
/* Updated: 2026/03/21 03:32:26 by apuyane ### ########.fr */
9+
/* Updated: 2026/03/24 06:50:34 by apuyane ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

@@ -83,5 +83,5 @@ void ft_add_history(char *line, t_data *data)
8383
}
8484
}
8585
}
86-
free_double(path, last);
86+
free_var(2, path, last);
8787
}

0 commit comments

Comments
 (0)