tvdu29/push_swap
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

the week-end party goes on \o\ /o/

Browse Source 
finished transition to t_psdata format
corrected some pointer formating
started testing on parser function:
	- weird valgrind errors about uninitialised values
	- some read/write/free errors still hanging around

** END TRANSMISSION **
This commit is contained in:
Tanguy MAZE
2019-02-24 18:15:56 +01:00
parent beba6ce86f
commit 62764dc5e7
7 changed files with 78 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
srcs/ps_stktools.c
View File

@@ -6,7 +6,7 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/02/22 14:41:27 by tmaze #+# #+# */
/* Updated: 2019/02/23 13:30:09 by tmaze ### ########.fr */
/* Updated: 2019/02/24 17:41:40 by tmaze ### ########.fr */
/* */
/* ************************************************************************** */
@@ -24,36 +24,64 @@ t_stack *ps_stknew(int nb)
return (ret);
}
void *ps_stkpsh(t_stack **s, t_stack *new)
void ps_stkpsh(t_psdata *data, char c, t_stack *new)
{
t_stack *ind;
t_stack **s;
size_t size;
if (s != NULL && *s == NULL)
*s = new;
else if (s != NULL)
s = NULL;
if (data != NULL && new != NULL)
{
ind = *s;
*s = new;
new->next = ind;
if (c == 'a')
s = &(data->a);
if (c == 'a')
size = data->size_a;
if (c == 'b')
s = &(data->b);
if (c == 'b')
size = data->size_b;
if (s != NULL && *s == NULL && (size++))
*s = new;
else if (s != NULL && *s != NULL)
{
ind = *s;
*s = new;
new->next = ind;
size++;
}
}
}
t_stack *ps_stkpop(t_stack **s)
t_stack *ps_stkpop(t_psdata *data, char c)
{
t_stack *ret;
t_stack **s;
size_t size;
if (c == 'a')
s = &(data->a);
if (c == 'a')
size = data->size_a;
if (c == 'b')
s = &(data->b);
if (c == 'b')
size = data->size_b;
else if (c != 'a' && c != 'b')
return (NULL);
ret = NULL;
if (s != NULL && *s != NULL)
{
ret = *s;
*s = ret->next;
size--;
}
return (ret);
}
void ft_lstdelstr(void *content, size_t content_size)
{
ft_strdel(&content);
ft_strdel((char**)&content);
content_size = 0;
}
@@ -66,7 +94,7 @@ void ps_stkclean(t_psdata *data)
{
tmp = data->a;
data->a = data->a->next;
ft_memedel(&tmp);
ft_memdel((void**)&tmp);
data->size_a--;
}
tmp = data->b;
@@ -74,8 +102,8 @@ void ps_stkclean(t_psdata *data)
{
tmp = data->b;
data->b = data->b->next;
ft_memedel(&tmp);
ft_memdel((void**)&tmp);
data->size_b--;
}
ft_lstdel(&op, &ft_lstdelstr);
ft_lstdel(&(data->op), &ft_lstdelstr);
}