clean up code for when an error occurs

testing with all maps is what is left
This commit is contained in:
Mthandazo Ndhlovu 2019-04-11 14:11:25 +02:00
parent eb85b914a4
commit 0495ba9e55
3 changed files with 8 additions and 7 deletions

View File

@ -6,7 +6,7 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */ /* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/03/23 17:31:19 by tmaze #+# #+# */ /* Created: 2019/03/23 17:31:19 by tmaze #+# #+# */
/* Updated: 2019/04/11 12:47:51 by mndhlovu ### ########.fr */ /* Updated: 2019/04/11 10:50:04 by tmaze ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -68,7 +68,6 @@ typedef struct s_syntax
int l_error; int l_error;
int s_vert; int s_vert;
int e_vert; int e_vert;
int gr_status;
int e_cmd; int e_cmd;
int e_pos; int e_pos;
int v_flag; int v_flag;
@ -103,7 +102,7 @@ int lm_add_vertex(t_lmdata *ldata, char *raw, char flag
int lm_ext_conn(t_holder *holder, t_lmdata *data int lm_ext_conn(t_holder *holder, t_lmdata *data
, char *raw); , char *raw);
int lm_find_index(t_lmdata *data, char *str); int lm_find_index(t_lmdata *data, char *str);
void lm_clear_unv(t_holder *holder);
int lm_get_value(char *line); int lm_get_value(char *line);
void lm_get_cmd_vert(int count, t_syntax *synt void lm_get_cmd_vert(int count, t_syntax *synt
, t_lmdata *ldata, char *line); , t_lmdata *ldata, char *line);
@ -114,7 +113,8 @@ int lm_validate_rooms(char *name, char *x, char *y);
int lm_adj_parser(t_lmdata *lmdata, t_holder *holder); int lm_adj_parser(t_lmdata *lmdata, t_holder *holder);
void lm_init_data(t_syntax *synt, t_holder *holder void lm_init_data(t_syntax *synt, t_holder *holder
, t_lmdata *ldata); , t_lmdata *ldata);
int lm_verify_cmd(t_syntax *synt, t_holder *holder
, t_lmdata *data);
void lm_initdata(t_lmdata *data); void lm_initdata(t_lmdata *data);
int lm_getparams(t_lmdata *data); int lm_getparams(t_lmdata *data);
void lm_clean_data(t_lmdata *data); void lm_clean_data(t_lmdata *data);

View File

@ -41,7 +41,7 @@ static int lem_in(t_syntax *synt, t_holder *holder,
{ {
if (!(lm_parser(synt, lmdata, holder))) if (!(lm_parser(synt, lmdata, holder)))
return (0); return (0);
if (!(lm_verify_cmd(synt, holder, data))) if (!(lm_verify_cmd(synt, holder, lmdata)))
return (0); return (0);
if (!lst_indinit(lmdata)) if (!lst_indinit(lmdata))
return (0); return (0);

View File

@ -31,7 +31,7 @@ void lm_clear_unv(t_holder *holder)
t_temp *flush; t_temp *flush;
data = holder->data; data = holder->data;
while (tmp) while (data)
{ {
flush = data; flush = data;
data = data->next; data = data->next;
@ -48,5 +48,6 @@ int lm_verify_cmd(t_syntax *synt, t_holder *holder, t_lmdata *data)
&& synt->nb_state && (holder->count > 0) && synt->nb_state && (holder->count > 0)
&& (data->nb_nodes > 0)) && (data->nb_nodes > 0))
return (1); return (1);
lm_clear_unv(holder);
return (0); return (0);
} }