42/42_INT_06_pushwap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

leaks and leaks with errors should be ok

Browse Source
This commit is contained in:
hugogogo
2021-09-27 11:40:43 +02:00
parent 7f8d114b99
commit db60d412e8
6 changed files with 21 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
srcs/push_swap.c
View File

@@ -1,13 +1,5 @@
#include "push_swap.h"
// check more error
void is_valid(int ac, char **av)
{
if (ac < 2)
ps_stop(NULL, 1);
(void)av;
}
int check_flag(int *ac, char ***av)
{
if (ft_strcmp((*av)[1], "-p") == 0)
@@ -32,19 +24,16 @@ t_stack *fill_stack(t_stack *list, char *nb)
new = ft_calloc(1, sizeof(t_stack));
if (!new)
ps_stop((t_list *)list, 2);
/*
if (ft_isnumber(nb) == 0)
ps_stop((t_list *)list, 2);
nbl = ft_atol(nb);
if (nbl < INT_MIN || nbl > INT_MAX)
ps_stop((t_list *)list, 2);
new->n = nbl;
new->limit = 0;
ps_stop((t_list *)list, 3);
new->next = list;
list = new;
*/
if (ft_isnumber(nb) == 0)
ps_stop((t_list *)list, 3);
nbl = ft_atol(nb);
if (nbl < INT_MIN || nbl > INT_MAX)
ps_stop((t_list *)list, 3);
list->n = nbl;
list->limit = 0;
return (list);
}
@@ -102,7 +91,8 @@ int main(int ac, char **av)
t_list *solution;
int flag;
is_valid(ac, av);
if (ac < 2)
ps_stop(NULL, 1);
flag = check_flag(&ac, &av);
a = init_stack(ac, av);
b = NULL;

8
srcs/stop.c
View File

@@ -4,22 +4,22 @@ void ps_error(int err)
{
if (err == 1)
ft_printf("usage :\nlaunch executable : ./push_swap [flag -p] nb nb nb nb nb ...\n");
if (err == 2)
if (err >= 2)
ft_putstr_fd("Error\n", 2);
exit(0);
}
/*
** if err < 0, the parameter list is just a t_stack *list
** if err = 0, the list are freed but the program doesn't stop
** if err > 0, a message is printed and the program stop
** if err = 1, 2 or 3, a message is printed and the program stop
** if err = 3, the parameter list is just a t_stack *list
*/
void ps_stop(t_list *lst, int err)
{
t_stack **a;
t_stack **b;
if (err < 0)
if (err == 3)
ft_lstclear(&lst, NULL);
else if (lst)
{