Skip to content

Commit 3704285

Browse files
author
Allan BARRIELLE
committed
Normi Done
1 parent 38b2616 commit 3704285

File tree

13 files changed

+99
-61
lines changed

13 files changed

+99
-61
lines changed

‎Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# By: abarriel <abarriel@student.42.fr> +#+ +:+ +#+ #
77
# +#+#+#+#+#+ +#+ #
88
# Created: 2017/02/19 11:33:06 by abarriel #+# #+# #
9-
# Updated: 2017/03/19 00:15:37 by abarriel ### ########.fr #
9+
# Updated: 2017/03/19 05:52:25 by abarriel ### ########.fr #
1010
# #
1111
# **************************************************************************** #
1212

@@ -18,14 +18,14 @@ OBJ = $(addprefix srcs/,$(SRC:.c=.o))
1818

1919
INCLUDES = ./includes/lemin.h
2020

21-
CFLAGS = -Wall -Wextra -I./includes/ -Ilibft/includes/
21+
CFLAGS = -Wall -Wextra -Werror -I./includes/ -Ilibft/includes/
2222

2323
all: makefile libft $(NAME)
2424

2525
libft:
2626
@make -C libft
2727

28-
$(NAME): $(OBJ) $(INCLUDES)
28+
$(NAME): libft $(OBJ) $(INCLUDES)
2929
@gcc $(OBJ) -o $(NAME) -Llibft -lft
3030
@echo "$^"
3131

‎includes/lemin.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/* By: abarriel <abarriel@student.42.fr> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2017/02/19 11:33:00 by abarriel #+# #+# */
9-
/* Updated: 2017/03/19 04:24:16 by abarriel ### ########.fr */
9+
/* Updated: 2017/03/19 05:41:17 by abarriel ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

@@ -54,7 +54,7 @@ typedef struct s_ant
5454
int bonus_color;
5555
int bonus_path;
5656
} t_ant;
57-
int dashi(char *line);
57+
int dashi(char *line);
5858
int check_stop(t_tube *r);
5959
int verif_no(t_room *tmp);
6060
int multi_path(t_room *r, t_ant *a);
@@ -79,5 +79,5 @@ void print_path(t_path *path);
7979
void add_back_room(t_room **r, char *name, int index);
8080
t_ant *init_ant(char *name, int bp, int bc);
8181
void parser(int bp, int bc);
82-
void free_split(char **tab);
82+
void free_split(char **tab);
8383
#endif

‎libft/get_next_line.c‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
1+
/* ************************************************************************** */
2+
/* */
3+
/* ::: :::::::: */
4+
/* get_next_line.c :+: :+: :+: */
5+
/* +:+ +:+ +:+ */
6+
/* By: abarriel <abarriel@student.42.fr> +#+ +:+ +#+ */
7+
/* +#+#+#+#+#+ +#+ */
8+
/* Created: 2017/03/19 05:41:54 by abarriel #+# #+# */
9+
/* Updated: 2017/03/19 05:53:01 by abarriel ### ########.fr */
10+
/* */
11+
/* ************************************************************************** */
12+
113
#include "get_next_line.h"
214

3-
static char *strjoin(char *new, char *buff)
15+
static char *str_join(char *new, char *buff)
416
{
517
char *tmp;
618

@@ -61,21 +73,19 @@ int get_next_line(const int fd, char **line)
6173
new = ft_strnew(1);
6274
if (BUFF_SIZE < 0 || !line || fd < 0)
6375
return (-1);
64-
ret = 2;
6576
while (!(ft_strchr(new, '\n')))
6677
{
67-
ret = read(fd, buff, BUFF_SIZE);
68-
if (ret == -1)
78+
if ((ret = read(fd, buff, BUFF_SIZE)) == -1)
6979
return (-1);
7080
buff[ret] = '\0';
71-
new = strjoin(new, buff);
72-
if (ret == 0 && *new == '\0')
81+
new = str_join(new, buff);
82+
if (*new != '\0')
83+
break ;
84+
else
7385
{
7486
ft_putendl(new);
7587
return (0);
7688
}
77-
if (ret == 0)
78-
break ;
7989
}
8090
*line = ft_stock_the_new_line(new);
8191
new = ft_clean_new(new);

‎libft/includes/libft.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
/* ::: :::::::: */
44
/* libft.h :+: :+: :+: */
55
/* +:+ +:+ +:+ */
6-
/* By: abarriel <marvin@42.fr> +#+ +:+ +#+ */
6+
/* By: abarriel <abarriel@student.42.fr> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2016/11/06 21:11:10 by abarriel #+# #+# */
9-
/* Updated: 2016/12/10 16:25:39 by abarriel ### ########.fr */
9+
/* Updated: 2017/03/19 05:57:58 by abarriel ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

@@ -25,6 +25,7 @@ typedef struct s_list
2525
size_t content_size;
2626
struct s_list *next;
2727
} t_list;
28+
void free_split(char **tab);
2829
int ft_sdigit(char *c);
2930
long ft_atol(const char *str);
3031
int ft_atoi_p(char **s);

‎libft/string/free_split.c‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
/* ************************************************************************** */
2+
/* */
3+
/* ::: :::::::: */
4+
/* free_split.c :+: :+: :+: */
5+
/* +:+ +:+ +:+ */
6+
/* By: abarriel <abarriel@student.42.fr> +#+ +:+ +#+ */
7+
/* +#+#+#+#+#+ +#+ */
8+
/* Created: 2017/03/19 05:57:18 by abarriel #+# #+# */
9+
/* Updated: 2017/03/19 05:57:47 by abarriel ### ########.fr */
10+
/* */
11+
/* ************************************************************************** */
12+
13+
#include "libft.h"
14+
15+
void free_split(char **tab)
16+
{
17+
int i;
18+
19+
i = 0;
20+
while (tab[i])
21+
{
22+
ft_strdel(&tab[i]);
23+
i++;
24+
}
25+
free(tab);
26+
}

‎srcs/algo.c‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
/* ************************************************************************** */
2+
/* */
3+
/* ::: :::::::: */
4+
/* algo.c :+: :+: :+: */
5+
/* +:+ +:+ +:+ */
6+
/* By: abarriel <marvin@42.fr> +#+ +:+ +#+ */
7+
/* +#+#+#+#+#+ +#+ */
8+
/* Created: 2017/03/19 05:34:47 by abarriel #+# #+# */
9+
/* Updated: 2017/03/19 05:34:49 by abarriel ### ########.fr */
10+
/* */
11+
/* ************************************************************************** */
12+
113
#include "lemin.h"
214

315
void algo_lem__(t_room **r1, t_tube **tmp1, t_room *begin, t_room *debut)

‎srcs/algo_.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
/* ::: :::::::: */
44
/* algo_.c :+: :+: :+: */
55
/* +:+ +:+ +:+ */
6-
/* By: abarriel <marvin@42.fr> +#+ +:+ +#+ */
6+
/* By: abarriel <abarriel@student.42.fr> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2017/03/13 14:27:42 by abarriel #+# #+# */
9-
/* Updated: 2017/03/13 14:27:50 by abarriel ### ########.fr */
9+
/* Updated: 2017/03/19 05:58:22 by abarriel ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

‎srcs/lemin.c‎

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,12 @@
66
/* By: abarriel <abarriel@student.42.fr> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2017/02/19 11:32:52 by abarriel #+# #+# */
9-
/* Updated: 2017/03/19 05:28:56 by abarriel ### ########.fr */
9+
/* Updated: 2017/03/19 05:58:59 by abarriel ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

1313
#include "lemin.h"
1414

15-
void free_split(char **tab)
16-
{
17-
int i;
18-
19-
i = 0;
20-
while(tab[i])
21-
{
22-
ft_strdel(&tab[i]);
23-
i++;
24-
}
25-
free(tab);
26-
}
2715
int if_so_(char conv, char *symb)
2816
{
2917
char *tmp;
@@ -50,6 +38,15 @@ int if_so_(char conv, char *symb)
5038
return (0);
5139
}
5240

41+
void init_ant_(t_ant *r, int bc, int bp)
42+
{
43+
r->start = r->ant;
44+
r->end = 0;
45+
r->dant = 0;
46+
r->bonus_color = bc;
47+
r->bonus_path = bp;
48+
}
49+
5350
t_ant *init_ant(char *name, int bp, int bc)
5451
{
5552
t_ant *r;
@@ -74,11 +71,7 @@ t_ant *init_ant(char *name, int bp, int bc)
7471
ft_exit("Failed to Malloc");
7572
ft_strdel(&name);
7673
r->ant = i;
77-
r->start = r->ant;
78-
r->end = 0;
79-
r->dant = 0;
80-
r->bonus_color = bc;
81-
r->bonus_path = bp;
74+
init_ant_(r, bc, bp);
8275
return (r);
8376
}
8477

‎srcs/parser.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
/* By: abarriel <abarriel@student.42.fr> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2017/02/19 11:33:15 by abarriel #+# #+# */
9-
/* Updated: 2017/03/19 05:30:30 by abarriel ### ########.fr */
9+
/* Updated: 2017/03/19 05:36:46 by abarriel ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

1313
#include "lemin.h"
1414

15-
int dashi(char *line)
15+
int dashi(char *line)
1616
{
1717
int i;
1818
int dash;
@@ -29,6 +29,7 @@ int dashi(char *line)
2929
return (0);
3030
return (1);
3131
}
32+
3233
void check_room(t_room *tmp)
3334
{
3435
t_room *begin_list;

‎srcs/path.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/* By: abarriel <abarriel@student.42.fr> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2017/03/05 02:15:55 by abarriel #+# #+# */
9-
/* Updated: 2017/03/19 03:39:12 by abarriel ### ########.fr */
9+
/* Updated: 2017/03/19 05:44:52 by abarriel ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

@@ -15,27 +15,27 @@
1515
int verif_no_path(t_tube *t)
1616
{
1717
t_tube *tmp;
18+
1819
tmp = t;
1920
while (t)
2021
{
2122
if (t->room->poids == 0 || t->room->poids == 1)
22-
break;
23+
break ;
2324
t = t->next;
2425
}
25-
if(!t)
26+
if (!t)
2627
return (1);
2728
t = tmp;
28-
return 0;
29+
return (0);
2930
}
3031

3132
void save_path_(t_room **r, t_path **p, int size)
3233
{
33-
t_tube *tmp;
34-
3534
add_back_path(p, (*r), size);
3635
while ((*r) && (*r)->end != 1)
3736
{
38-
while ((*r)->tube && ((*r)->tube->room->by == 4 || (*r)->tube->room->poids != 1))
37+
while ((*r)->tube && ((*r)->tube->room->by == 4 ||
38+
(*r)->tube->room->poids != 1))
3939
(*r)->tube = (*r)->tube->next;
4040
if ((*r)->by != 4 && (*r)->tube->room->poids == 1 && (*r)->start != 1)
4141
{
@@ -58,7 +58,7 @@ t_path *save_path(t_room *r, int *i)
5858

5959
p = 1;
6060
path = NULL;
61-
while(r && r->start != 1)
61+
while (r && r->start != 1)
6262
r = r->next;
6363
if (!r->tube || verif_no_path(r->tube))
6464
{

0 commit comments

Comments
 (0)